Author: tilman Date: 2006-05-20 20:47:00 +0200 (Sat, 20 May 2006) New Revision: 1418 Modified: crux-2.2/ports/core/cpio/.md5sum crux-2.2/ports/core/cpio/Pkgfile crux-2.2/ports/core/cpio/cpio-2.6.patch Log: cpio: add missing checks for setlocale() and lstat() to configure.ac. call autoreconf explicitly Modified: crux-2.2/ports/core/cpio/.md5sum =================================================================== --- crux-2.2/ports/core/cpio/.md5sum 2006-05-20 14:11:41 UTC (rev 1417) +++ crux-2.2/ports/core/cpio/.md5sum 2006-05-20 18:47:00 UTC (rev 1418) @@ -1,2 +1,2 @@ -546dbd4aa403e5ee2dd4065e077b9917 cpio-2.6.patch +7fcfa25a86d655602da8b0bc293d46a5 cpio-2.6.patch 25e0e8725bc60ed3460c9cde92752674 cpio-2.6.tar.bz2 Modified: crux-2.2/ports/core/cpio/Pkgfile =================================================================== --- crux-2.2/ports/core/cpio/Pkgfile 2006-05-20 14:11:41 UTC (rev 1417) +++ crux-2.2/ports/core/cpio/Pkgfile 2006-05-20 18:47:00 UTC (rev 1418) @@ -11,6 +11,7 @@ build() { cd $name-$version patch -p1 < ../$name-$version.patch + autoreconf --install --force ./configure --prefix=/usr make make DESTDIR=$PKG install Modified: crux-2.2/ports/core/cpio/cpio-2.6.patch =================================================================== --- crux-2.2/ports/core/cpio/cpio-2.6.patch 2006-05-20 14:11:41 UTC (rev 1417) +++ crux-2.2/ports/core/cpio/cpio-2.6.patch 2006-05-20 18:47:00 UTC (rev 1418) @@ -1,13 +1,18 @@ -Description: Fix for not allowing a malicious cpio file to extract to an arbitrary directory. +Description: Fix for not allowing a malicious cpio file to extract to an arbitrary directory. Added missing checks for setlocale() and lstat(). The latter fixes a symlink handling problem. Origin: http://lwn.net/Articles/143418/ http://www.xs4all.nl/~hanb/software/crux/han/cpio/cpio.patch + http://www.linuxfromscratch.org/blfs/view/6.1/general/cpio.html Upstream status: Unknown (2005-07-21) -diff -Nru cpio-2.6/configure.ac cpio-2.6-new/configure.ac ---- cpio-2.6/configure.ac 2004-12-20 11:46:30.000000000 +0100 -+++ cpio-2.6-new/configure.ac 2005-07-21 16:07:42.000000000 +0200 -@@ -95,7 +95,7 @@ - AC_CHECK_FUNCS(lchown endpwent endgrent) +diff -aur cpio-2.6.orig/configure.ac cpio-2.6/configure.ac +--- cpio-2.6.orig/configure.ac 2004-12-20 11:46:30.000000000 +0100 ++++ cpio-2.6/configure.ac 2006-05-20 20:13:46.832935750 +0200 +@@ -92,10 +92,10 @@ + AC_CONFIG_LINKS(src/fnmatch.h:headers/fnmatch.h) + fi + +-AC_CHECK_FUNCS(lchown endpwent endgrent) ++AC_CHECK_FUNCS(setlocale lstat lchown endpwent endgrent) AC_FUNC_VPRINTF AC_FUNC_ALLOCA -AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"])