vapier      08/09/21 10:08:48

  Added:                zip-3.0-pic.patch zip-3.0-build.patch
                        zip-3.0-exec-stack.patch
  Log:
  Version bump #237141 by Conrad Kostecki.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64)

Revision  Changes    Path
1.1                  app-arch/zip/files/zip-3.0-pic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-pic.patch?rev=1.1&content-type=text/plain

Index: zip-3.0-pic.patch
===================================================================
if our toolchain generates PIC by default, then do not use the hand written
assembly files as none of it is PIC friendly.

--- unix/configure
+++ unix/configure
@@ -29,6 +29,9 @@
 echo Check if we can use asm code
 OBJA=""
 OCRCU8=""
+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
+echo "Checking if compiler wants to create pic code"
+[ "$piclib" == "" ] && \
 if eval "$CPP match.S > _match.s 2>/dev/null"; then
   if test ! -s _match.s || grep error < _match.s > /dev/null; then
     :



1.1                  app-arch/zip/files/zip-3.0-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-build.patch?rev=1.1&content-type=text/plain

Index: zip-3.0-build.patch
===================================================================
respect build environment settings

--- zip/unix/configure
+++ zip/unix/configure
@@ -18,7 +18,7 @@
 
 CC=${1-cc}
 CFLAGS=${2-"-I. -DUNIX"}
-LFLAGS1=''
+LFLAGS1="${LDFLAGS}"
 LFLAGS2=''
 LN="ln -s"
 
@@ -118,7 +118,7 @@ _EOF_
 fi
 
 # optimization flags
-if test -n "${CFLAGS_OPT}"; then
+if false; then
   CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
   CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
 fi
@@ -220,13 +220,6 @@ fi
 echo Check for the C preprocessor
 # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
 CPP="${CC} -E"
-# solaris as(1) needs -P, maybe others as well ?
-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
-[ -f /lib/cpp ] && CPP=/lib/cpp
-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
-[ -f /xenix ] && CPP="${CC} -E"
-[ -f /lynx.os ] && CPP="${CC} -E"
 
 echo "#include <stdio.h>" > conftest.c
 $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"



1.1                  app-arch/zip/files/zip-3.0-exec-stack.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-exec-stack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-3.0-exec-stack.patch?rev=1.1&content-type=text/plain

Index: zip-3.0-exec-stack.patch
===================================================================
add proper GNU stack markings so we dont get the default: executable

--- zip-2.31/crc_i386.S
+++ zip-2.31/crc_i386.S
@@ -238,3 +238,7 @@
 #endif /* i386 || _i386 || _I386 || __i386 */
 
 #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+
+#if defined __ELF__ && defined __linux__
+.section .note.GNU-stack,"",@progbits
+#endif
--- zip-2.31/match.S
+++ zip-2.31/match.S
@@ -405,3 +405,7 @@
 #endif /* i386 || _I386 || _i386 || __i386  */
 
 #endif /* !USE_ZLIB */
+
+#if defined __ELF__ && defined __linux__
+.section .note.GNU-stack,"",@progbits
+#endif