daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

remove old files not referenced in source

Browse Source
This commit is contained in:
Danny Rawlins 2019-09-22 15:42:08 +10:00
parent 42cb4a49fa
commit 29c6dc9a46
10 changed files with 0 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/config.h
View File

@ -1,12 +0,0 @@
/* config.h stub */
#ifndef __STUB__CONFIG_H__
#define __STUB__CONFIG_H__
#if defined(__x86_64__)
#include "config-64.h"
#else
#include "config-32.h"
#endif
#endif

12
clang/llvm-config.h
View File

@ -1,12 +0,0 @@
/* llvm-config.h stub */
#ifndef __STUB__LLVMCONFIG_H__
#define __STUB__LLVMCONFIG_H__
#if defined(__x86_64__)
#include "llvm-config-64.h"
#else
#include "llvm-config-32.h"
#endif
#endif

92
cyrus-sasl/fix-CVE-2013-4122.diff
View File

@ -1,92 +0,0 @@
diff -r -u cyrus-sasl-2.1.26-orig/pwcheck/pwcheck_getpwnam.c cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c
--- cyrus-sasl-2.1.26-orig/pwcheck/pwcheck_getpwnam.c 2012-01-28 00:31:36.000000000 +0100
+++ cyrus-sasl-2.1.26/pwcheck/pwcheck_getpwnam.c 2014-07-16 13:14:09.989720984 +0200
@@ -32,6 +32,7 @@
char *password;
{
char* r;
+ char* crpt_passwd;
struct passwd *pwd;
pwd = getpwnam(userid);
@@ -41,7 +42,7 @@
else if (pwd->pw_passwd[0] == '*') {
r = "Account disabled";
}
- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
+ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
r = "Incorrect password";
}
else {
diff -r -u cyrus-sasl-2.1.26-orig/pwcheck/pwcheck_getspnam.c cyrus-sasl-2.1.26/pwcheck/pwcheck_getspnam.c
--- cyrus-sasl-2.1.26-orig/pwcheck/pwcheck_getspnam.c 2012-01-28 00:31:36.000000000 +0100
+++ cyrus-sasl-2.1.26/pwcheck/pwcheck_getspnam.c 2014-07-16 13:22:36.257720924 +0200
@@ -32,13 +32,14 @@
char *password;
{
struct spwd *pwd;
+ char *crpt_passwd;
pwd = getspnam(userid);
if (!pwd) {
return "Userid not found";
}
- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
+ if (!(crpt_passwd = crypt(password, pwd->sp_pwdp)) || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
return "Incorrect password";
}
else {
diff -r -u cyrus-sasl-2.1.26-orig/saslauthd/auth_getpwent.c cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c
--- cyrus-sasl-2.1.26-orig/saslauthd/auth_getpwent.c 2012-10-12 16:05:48.000000000 +0200
+++ cyrus-sasl-2.1.26/saslauthd/auth_getpwent.c 2014-07-16 13:16:29.569720968 +0200
@@ -77,6 +77,7 @@
{
/* VARIABLES */
struct passwd *pw; /* pointer to passwd file entry */
+ char *crpt_passwd; /* encrypted password */
int errnum;
/* END VARIABLES */
@@ -105,7 +106,7 @@
}
}
- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
+ if (!(crpt_passwd = crypt(password, pw->pw_passwd)) || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
if (flags & VERBOSE) {
syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
}
diff -r -u cyrus-sasl-2.1.26-orig/saslauthd/auth_shadow.c cyrus-sasl-2.1.26/saslauthd/auth_shadow.c
--- cyrus-sasl-2.1.26-orig/saslauthd/auth_shadow.c 2012-10-12 16:05:48.000000000 +0200
+++ cyrus-sasl-2.1.26/saslauthd/auth_shadow.c 2014-07-16 13:18:20.208720954 +0200
@@ -210,8 +210,7 @@
RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
}
- cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
- if (strcmp(sp->sp_pwdp, cpw)) {
+ if (!(cpw = crypt(password, sp->sp_pwdp)) || strcmp(sp->sp_pwdp, (const char *)cpw)) {
if (flags & VERBOSE) {
/*
* This _should_ reveal the SHADOW_PW_LOCKED prefix to an
@@ -221,10 +220,8 @@
syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
sp->sp_pwdp, cpw);
}
- free(cpw);
RETURN("NO Incorrect password");
}
- free(cpw);
/*
* The following fields will be set to -1 if:
@@ -286,7 +283,7 @@
RETURN("NO Invalid username");
}
- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
+ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
if (flags & VERBOSE) {
syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
password, upw->upw_passwd);

48
gnu-efi/efipxebc.h.patch
View File

@ -1,48 +0,0 @@
https://github.com/vathpela/gnu-efi/commit/e4ca94374c7ece8ec0100075710af8638e42c203
From e4ca94374c7ece8ec0100075710af8638e42c203 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 8 Feb 2017 15:28:18 -0500
Subject: [PATCH] Fix typedef of EFI_PXE_BASE_CODE
Commit 751cbce3 fixed up a bunch of types to better match the edk2
definitions and the names in the UEFI Spec, but while doing so
inadvertantly defined things thusly:
INTERFACE_DECL(_EFI_PXE_BASE_CODE_PROTOCOL);
...
typedef struct _EFI_PXE_BASE_CODE_PROTOCOL {
...
} EFI_PXE_BASE_CODE_PROTOCOL;
...
typedef struct _EFI_PXE_BASE_CODE_PROTOCOL _EFI_PXE_BASE_CODE;
typedef struct EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
Because EFI_BASE_CODE_PROTOCOL is declared with a typedef, and is
therefore in the type namespace rather than the struct namespace, this
results in EFI_PXE_BASE_CODE being a forward declaration of an
incomplete type. The net result is that code which dereferences any
field in the struct, even with the correct names, will not correctly
build.
This patch changes both _EFI_PXE_BASE_CODE and EFI_PXE_BASE_CODE
typedefs to inherit from struct _EFI_PXE_BASE_CODE_PROTOCOL.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
inc/efipxebc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/efipxebc.h b/inc/efipxebc.h
index 580a6ef..3760c7c 100644
--- a/inc/efipxebc.h
+++ b/inc/efipxebc.h
@@ -419,7 +419,7 @@ typedef struct _EFI_PXE_BASE_CODE_PROTOCOL {
// Use 'EFI_PXE_BASE_CODE_PROTOCOL_GUID' instead.
typedef struct _EFI_PXE_BASE_CODE_PROTOCOL _EFI_PXE_BASE_CODE;
-typedef struct EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
+typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
//
// Call Back Definitions

32
gtk/CVE-2013-7447.patch
View File

@ -1,32 +0,0 @@
From 407c89863d08780861d120f8ccfc8e13582a2fda Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 29 Jun 2013 22:06:54 -0400
Subject: Avoid integer overflow
Use g_malloc_n in gdk_cairo_set_source_pixbuf when allocating
a large block of memory, to avoid integer overflow.
Pointed out by Bert Massop in
https://bugzilla.gnome.org/show_bug.cgi?id=703220
(cherry picked from commit 894b1ae76a32720f4bb3d39cf460402e3ce331d6)
---
gdk/gdkcairo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index a3baa54..3fdb570 100644
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -211,7 +211,7 @@ gdk_cairo_set_source_pixbuf (cairo_t *cr,
format = CAIRO_FORMAT_ARGB32;
cairo_stride = cairo_format_stride_for_width (format, width);
- cairo_pixels = g_malloc (height * cairo_stride);
+ cairo_pixels = g_malloc_n (height, cairo_stride);
surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
format,
width, height, cairo_stride);
--
cgit v0.12

127
icu/icu-58.1-iterator.patch
View File

@ -1,127 +0,0 @@
source: http://bugs.icu-project.org/trac/changeset/39484/
Index: icu/common/ulist.c
===================================================================
--- icu/common/ulist.c (revision 39483)
+++ icu/common/ulist.c (revision 39484)
@@ -30,5 +30,4 @@
int32_t size;
- int32_t currentIndex;
};
@@ -52,5 +51,4 @@
newList->tail = NULL;
newList->size = 0;
- newList->currentIndex = -1;
return newList;
@@ -81,6 +79,7 @@
p->next->previous = p->previous;
}
- list->curr = NULL;
- list->currentIndex = 0;
+ if (p == list->curr) {
+ list->curr = p->next;
+ }
--list->size;
if (p->forceDelete) {
@@ -151,5 +150,4 @@
list->head->previous = newItem;
list->head = newItem;
- list->currentIndex++;
}
@@ -194,5 +192,4 @@
curr = list->curr;
list->curr = curr->next;
- list->currentIndex++;
return curr->data;
@@ -210,5 +207,4 @@
if (list != NULL) {
list->curr = list->head;
- list->currentIndex = 0;
}
}
@@ -273,3 +269,2 @@
return (UList *)(en->context);
}
-
Index: icu/i18n/ucol_res.cpp
===================================================================
--- icu/i18n/ucol_res.cpp (revision 39483)
+++ icu/i18n/ucol_res.cpp (revision 39484)
@@ -681,4 +681,5 @@
}
memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
+ ulist_resetList(sink.values); // Initialize the iterator.
en->context = sink.values;
sink.values = NULL; // Avoid deletion in the sink destructor.
Index: icu/test/intltest/apicoll.cpp
===================================================================
--- icu/test/intltest/apicoll.cpp (revision 39483)
+++ icu/test/intltest/apicoll.cpp (revision 39484)
@@ -82,14 +82,7 @@
col = Collator::createInstance(Locale::getEnglish(), success);
if (U_FAILURE(success)){
- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));
- return;
- }
-
- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);
- if (U_FAILURE(success)){
- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));
- return;
- }
- delete kwEnum;
+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));
+ return;
+ }
col->getVersion(versionArray);
@@ -230,4 +223,27 @@
delete aFrCol;
delete junk;
+}
+
+void CollationAPITest::TestKeywordValues() {
+ IcuTestErrorCode errorCode(*this, "TestKeywordValues");
+ LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));
+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) {
+ return;
+ }
+
+ LocalPointer<StringEnumeration> kwEnum(
+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));
+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {
+ return;
+ }
+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);
+ const char *kw;
+ UBool hasStandard = FALSE;
+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
+ if (strcmp(kw, "standard") == 0) {
+ hasStandard = TRUE;
+ }
+ }
+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);
}
@@ -2467,4 +2483,5 @@
TESTCASE_AUTO_BEGIN;
TESTCASE_AUTO(TestProperty);
+ TESTCASE_AUTO(TestKeywordValues);
TESTCASE_AUTO(TestOperators);
TESTCASE_AUTO(TestDuplicate);
Index: icu/test/intltest/apicoll.h
===================================================================
--- icu/test/intltest/apicoll.h (revision 39483)
+++ icu/test/intltest/apicoll.h (revision 39484)
@@ -36,4 +36,5 @@
*/
void TestProperty(/* char* par */);
+ void TestKeywordValues();
/**

224
icu/icu-58.1-remove-bashisms.patch
View File

@ -1,224 +0,0 @@
diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in
--- a/config/Makefile.inc.in 2016-09-09 23:28:18.000000000 +0200
+++ b/config/Makefile.inc.in 2016-11-05 19:43:07.688466668 +0100
@@ -124,12 +124,6 @@
# with usually. Many applications will want to add $(ICULIBS_I18N) as well.
ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
-# Proper echo newline handling is needed in icu-config
-ECHO_N=@ICU_ECHO_N@
-ECHO_C=@ICU_ECHO_C@
-# Not currently being used but good to have for proper tab handling
-ECHO_T=@ICU_ECHO_T@
-
##################################################################
##################################################################
#
diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom
--- a/config/icu-config-bottom 2016-09-09 23:28:18.000000000 +0200
+++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100
@@ -218,65 +218,65 @@
;;
--cflags)
- echo $ECHO_N "${CFLAGS} ${ECHO_C}"
+ printf "%s" "${CFLAGS} "
;;
--cc)
- echo $ECHO_N "${CC} ${ECHO_C}"
+ printf "%s" "${CC} "
;;
--cxx)
- echo $ECHO_N "${CXX} ${ECHO_C}"
+ printf "%s" "${CXX} "
;;
--cxxflags)
- echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"
+ printf "%s" "${CXXFLAGS} "
;;
--cppflags)
# Don't echo the -I. - it's unneeded.
- echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //'
+ printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //'
;;
--cppflags-searchpath)
- echo $ECHO_N "-I${prefix}/include ${ECHO_C}"
+ printf "%s" "-I${prefix}/include "
;;
--cppflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCPPFLAGS} "
;;
--cxxflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCXXFLAGS} "
;;
--cflags-dynamic)
- echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"
+ printf "%s" "${SHAREDLIBCFLAGS} "
;;
--ldflags-system)
- echo $ECHO_N "${LIBS} ${ECHO_C}"
+ printf "%s" "${LIBS} "
;;
--ldflags)
- echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"
+ printf "%s" "${LDFLAGS} ${ICULIBS} "
# $RPATH_LDFLAGS
;;
--ldflags-libsonly)
- echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"
+ printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
;;
--ldflags-icuio)
- echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
+ printf "%s" " ${ICULIBS_ICUIO} "
;;
--ldflags-obsolete)
- echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
+ printf "%s" "${ICULIBS_OBSOLETE} "
;;
--ldflags-toolutil)
- echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
+ printf "%s" " ${ICULIBS_TOOLUTIL} "
;;
--ldflags-layout)
@@ -285,7 +285,7 @@
;;
--ldflags-searchpath)
- echo $ECHO_N "-L${libdir} ${ECHO_C}"
+ printf "%s" "-L${libdir} "
;;
--detect-prefix)
@@ -321,47 +321,47 @@
;;
--shared-datadir)
- echo $ECHO_N "${datadir} ${ECHO_C}"
+ printf "%s" "${datadir} "
;;
--incfile)
- echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"
+ printf "%s" "${pkglibdir}/Makefile.inc "
;;
--incpkgdatafile)
- echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"
+ printf "%s" "${pkglibdir}/pkgdata.inc "
;;
--icudata)
- echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"
+ printf "%s" "${ICUDATA_NAME} "
;;
--icudata-mode)
- echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"
+ printf "%s" "${PKGDATA_MODE} "
;;
--icudata-install-dir)
- echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"
+ printf "%s" "${ICUPKGDATA_DIR} "
;;
--icudatadir)
- echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"
+ printf "%s" "${ICUDATA_DIR} "
;;
--shlib-c)
- echo $ECHO_N "${SHLIB_c} ${ECHO_C}"
+ printf "%s" "${SHLIB_c} "
;;
--shlib-cc)
- echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"
+ printf "%s" "${SHLIB_cc} "
;;
--version)
- echo $ECHO_N $VERSION
+ printf "%s" "$VERSION"
;;
--unicode-version)
- echo $ECHO_N $UNICODE_VERSION
+ printf "%s" "$UNICODE_VERSION"
;;
--host)
diff -ruN a/configure.ac b/configure.ac
--- a/configure.ac 2016-10-04 21:30:20.000000000 +0200
+++ b/configure.ac 2016-11-05 19:43:07.688466668 +0100
@@ -22,24 +22,6 @@
PACKAGE="icu"
AC_SUBST(PACKAGE)
-# Use custom echo test for newline option
-# Current autoconf (2.65) gives incorrect echo newline option
-# for icu-config
-# This may be removed later - mow (June 17, 2010)
-ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
-case `/bin/sh -c "echo -n x"` in
--n*)
- case `/bin/sh -c "echo 'x\c'"` in
- *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character.
- *) ICU_ECHO_C='\c';;
- esac;;
-*)
- ICU_ECHO_N='-n';;
-esac
-AC_SUBST(ICU_ECHO_N)
-AC_SUBST(ICU_ECHO_C)
-AC_SUBST(ICU_ECHO_T)
-
AC_MSG_CHECKING(for ICU version numbers)
# Get the ICU version from uversion.h or other headers
diff -ruN a/icudefs.mk.in b/icudefs.mk.in
--- a/icudefs.mk.in 2016-09-09 23:28:18.000000000 +0200
+++ b/icudefs.mk.in 2016-11-05 19:43:07.688466668 +0100
@@ -157,11 +157,6 @@
ENABLE_STATIC = @ENABLE_STATIC@
ENABLE_SHARED = @ENABLE_SHARED@
-# Echo w/o newline
-
-#ECHO_N = @ICU_ECHO_N@
-#ECHO_C = @ICU_ECHO_C@
-
# Commands to compile
COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c
diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in
--- a/test/hdrtst/Makefile.in 2016-09-28 06:17:24.000000000 +0200
+++ b/test/hdrtst/Makefile.in 2016-11-05 19:43:07.688466668 +0100
@@ -35,9 +35,6 @@
include $(shell icu-config --incfile)
DIRS=$(prefix)/include/unicode
LDIRS=$(prefix)/include/layout
-ECHO_T=@ECHO_T@
-ECHO_C=@ECHO_C@
-ECHO_N=@ECHO_N@
all:
@echo Please read this Makefile for more information.

24
libgd/libvpx-1.5.0-compatibility.patch
View File

@ -1,24 +0,0 @@
--- src/webpimg.c 2015-11-27 15:59:08.229502506 +0100
+++ src/webpimg.c 2015-11-27 16:00:23.412086698 +0100
@@ -711,14 +711,14 @@
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

114
tcsh/tcsh-6.19.00.patch
View File

@ -1,114 +0,0 @@
commit 624d3aebb6e6afadb4f35e894d11b5ebe290cd87
Author: christos <christos>
Date: Thu May 28 11:47:03 2015 +0000
avoid gcc-5 optimization malloc + memset = calloc (Fridolin Pokorny)
diff --git a/tc.alloc.c b/tc.alloc.c
index b9aec63..c1cb330 100644
--- a/tc.alloc.c
+++ b/tc.alloc.c
@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
{
#ifndef lint
char *cp;
+ size_t k;
i *= j;
cp = xmalloc(i);
- memset(cp, 0, i);
+ /* Stop gcc 5.x from optimizing malloc+memset = calloc */
+ k = i;
+ memset(cp, 0, k);
return ((memalign_t) cp);
#else
commit 05e7406049bd2686dee0ee8d819dcd38eb131f6f
Author: christos <christos>
Date: Tue Jul 7 12:24:54 2015 +0000
make k volatile to prevent gcc-5 memset() optimization (Fridolin Pokorny)
diff --git a/tc.alloc.c b/tc.alloc.c
index c1cb330..f68a8c5 100644
--- a/tc.alloc.c
+++ b/tc.alloc.c
@@ -348,7 +348,7 @@ calloc(size_t i, size_t j)
{
#ifndef lint
char *cp;
- size_t k;
+ volatile size_t k;
i *= j;
cp = xmalloc(i);
commit c43b072b89f19e9b41d45bdf3946593ae9bc6e5e
Author: christos <christos>
Date: Mon Aug 24 07:08:42 2015 +0000
restrict BSDWAIT to __GLIBC__ because other linux libraries (muslc) don't
have the macros.
diff --git a/sh.proc.c b/sh.proc.c
index 76eca3b..ad07250 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -47,7 +47,7 @@ RCSID("$tcsh$")
# define HZ 16
#endif /* aiws */
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__)
# if !defined(__ANDROID__)
# define BSDWAIT
# endif
commit eab72f9797ec4faaf1fb4de491c357f194b84dd6
Author: christos <christos>
Date: Thu Apr 14 11:09:09 2016 +0000
GLIBC is getting rid of union wait.
diff --git a/sh.proc.c b/sh.proc.c
index ad07250..5c68409 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -47,11 +47,11 @@ RCSID("$tcsh$")
# define HZ 16
#endif /* aiws */
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__)
-# if !defined(__ANDROID__)
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__)
+# if !defined(__ANDROID__) && !defined(__GLIBC__)
# define BSDWAIT
# endif
-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */
#ifndef WTERMSIG
# define WTERMSIG(w) (((union wait *) &(w))->w_termsig)
# ifndef BSDWAIT
diff -Nru tcsh-6.19.00.orig/config/linux tcsh-6.19.00/config/linux
--- tcsh-6.19.00.orig/config/linux 2016-09-22 17:51:43.086924218 +0200
+++ tcsh-6.19.00/config/linux 2016-09-22 17:54:16.123662001 +0200
@@ -86,11 +86,11 @@
*/
#define __STRICT_ANSI__
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
+#ifndef _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE
#endif
-#ifndef _SVID_SOURCE
-# define _SVID_SOURCE
+#ifndef _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE
#endif
#ifndef _POSIX_SOURCE
# define _POSIX_SOURCE

12
xterm/configure.diff
View File

@ -1,12 +0,0 @@
Fix a stupid bashism
--- configure.orig 2006-05-02 02:01:12.637169936 +0200
+++ configure 2006-05-02 02:01:30.861399432 +0200
@@ -5217,7 +5217,7 @@ if test "${with_app_defaults+set}" = set
withval="$with_app_defaults"
else
- withval="${appsdir-'\$(exec_prefix)/lib/X11/app-defaults'}"
+ withval="${appsdir-'\$\(exec_prefix\)/lib/X11/app-defaults'}"
fi;
case ".$withval" in #(vi
.\$\(*\)*|.\'*\'*) #(vi