Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=acbb11c26e1f53433318ffe201d4a8f6d4c7e483
commit acbb11c26e1f53433318ffe201d4a8f6d4c7e483 Author: Miklos Vajna <[email protected]> Date: Thu Aug 25 11:21:43 2011 +0200 checkinstall-1.6.1-2-i686 - bin, makepkg does this so much better diff --git a/source/devel-extra/checkinstall/CVE-2008-2958.patch b/source/devel-extra/checkinstall/CVE-2008-2958.patch deleted file mode 100644 index c513650..0000000 --- a/source/devel-extra/checkinstall/CVE-2008-2958.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: checkinstall -=================================================================== ---- checkinstall (revision 10000) -+++ checkinstall (working copy) -@@ -965,16 +965,8 @@ - - # Find a safe TMP_DIR - --TMP_DIR=${BASE_TMP_DIR}/`awk 'BEGIN { srand(); for (i=1;i<22;i++) { a=95; while (a > 90 && a < 97) { a=65+int(50*rand())}; printf("%c", a) } }'` --[ -e "$TMP_DIR" ] && rm -rf $TMP_DIR --if [ -e "$TMP_DIR" ]; then -- echo -- echog "My temp dir exists already.\nThis looks like a symlink attack!" -- echo -- echog "*** Aborting" -- echo -- exit 1 --fi -+TMP_DIR=`mktemp -q -d -p "${BASE_TMP_DIR}"` -+RETURN=$? - - if [ "$TMP_DIR" = "$BASE_TMP_DIR" -o "$TMP_DIR" = "/" ]; then - echo -@@ -985,11 +977,6 @@ - exit 1 - fi - -- --mkdir $TMP_DIR --chmod 700 $TMP_DIR --RETURN=$? -- - if [ $RETURN -gt 0 ]; then - echo - echog "**** Failed to create temp dir! \n**** Do you have write permission for %s? \n\n**** Aborting installation." "$BASE_TMP_DIR" -Index: installwatch-0.7.0beta5/installwatch -=================================================================== ---- installwatch-0.7.0beta5/installwatch (revision 10000) -+++ installwatch-0.7.0beta5/installwatch (working copy) -@@ -74,31 +74,8 @@ - local mkt_refdir=$1 - local mkt_wrkdir="" - -- mkt_wrkdir=${BASE_TMP_DIR}/\ --`awk 'BEGIN {\ -- srand();\ -- for (i=1;i<21;i++) {\ -- a=95;\ -- while (a > 90 && a < 97) {\ -- a=65+int(50*rand())\ -- };\ -- printf("%c", a) \ -- }\ --}'` -- -- [ -e "${mkt_wrkdir}" ] && rm -rf ${mkt_wrkdir} -- if [ -e "${mkt_wrkdir}" ]; then -- echo -- echo "Error : My temp dir exists already. This looks like a symlink attack!" -- echo -- echo "*** Aborting ***" -- echo -- exit 1 -- fi -+ mkt_wrkdir=`mktemp -q -d -p ${BASE_TMP_DIR}` - -- mkdir ${mkt_wrkdir} -- chmod 0700 ${mkt_wrkdir} -- - eval $mkt_refdir=\$mkt_wrkdir - } - diff --git a/source/devel-extra/checkinstall/FrugalBuild b/source/devel-extra/checkinstall/FrugalBuild deleted file mode 100644 index bd44e26..0000000 --- a/source/devel-extra/checkinstall/FrugalBuild +++ /dev/null @@ -1,41 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: Miklos Vajna <[email protected]> - -pkgname=checkinstall -pkgver=1.6.1 -ivver=0.7.0beta5 -pkgrel=2 -pkgdesc="Installs a compiled program from the program's source directory." -url="http://asic-linux.com.mx/~izto/checkinstall/"; -depends=('glibc') -backup=(etc/checkinstallrc) -groups=('devel-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url/download.php |grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" -source=($url/files/source/$pkgname-$pkgver.tgz glibc25-x86_64.patch \ - CVE-2008-2958.patch) -sha1sums=('c55f87f2902831fd9da566d14aa8421006e70492' \ - 'a3b0b64ba0f4b0709b25494b5850f84502cbc985' \ - '4005972144b9fdde420a407d0255969951ae4499') - -build() -{ - Fsed '/usr/local' '$(DESTDIR)/usr' Makefile - Fsed '/usr/local' '/usr' installwatch-$ivver/Makefile - Fsed 'BINDIR=' 'BINDIR=$(DESTDIR)' installwatch-$ivver/Makefile - Fsed 'LIBDIR=' 'LIBDIR=$(DESTDIR)' installwatch-$ivver/Makefile - Fmkdir /etc /usr/{bin,lib,sbin,share} - Fbuild - Fmv /usr/lib/checkinstall/checkinstallrc /etc/ - Fmv /usr/lib/checkinstall/locale /usr/share/ - Frm /usr/lib/checkinstall - Fsed '/usr/local' '/usr' $Fdestdir/etc/checkinstallrc - Fsed '/usr/local/lib/checkinstall/locale' '/usr/share/locale' \ - $Fdestdir/usr/sbin/checkinstall - Fsed '/usr/local/lib/checkinstall/checkinstallrc' '/etc/checkinstallrc' \ - $Fdestdir/usr/sbin/checkinstall - Fsed 'DOC_DIR=/usr/doc' 'DOC_DIR=/usr/share/doc' \ - $Fdestdir/usr/sbin/checkinstall -} - -# optimization OK diff --git a/source/devel-extra/checkinstall/glibc25-x86_64.patch b/source/devel-extra/checkinstall/glibc25-x86_64.patch deleted file mode 100644 index 345d3ff..0000000 --- a/source/devel-extra/checkinstall/glibc25-x86_64.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur checkinstall-1.6.1/installwatch-0.7.0beta5/installwatch.c checkinstall-1.6.1-p/installwatch-0.7.0beta5/installwatch.c ---- checkinstall-1.6.1/installwatch-0.7.0beta5/installwatch.c 2006-11-01 08:45:48.000000000 +0100 -+++ checkinstall-1.6.1-p/installwatch-0.7.0beta5/installwatch.c 2008-04-27 16:16:47.000000000 +0200 -@@ -77,7 +77,7 @@ - static int (*true_open)(const char *, int, ...); - static DIR *(*true_opendir)(const char *); - static struct dirent *(*true_readdir)(DIR *dir); --static int (*true_readlink)(const char*,char *,size_t); -+static ssize_t (*true_readlink)(const char*,char *,size_t); - static char *(*true_realpath)(const char *,char *); - static int (*true_rename)(const char *, const char *); - static int (*true_rmdir)(const char *); -@@ -539,7 +539,7 @@ - struct utimbuf timbuf; - size_t truesz; - char linkpath[PATH_MAX+1]; -- size_t linksz; -+ ssize_t linksz; - - #if DEBUG - debug(2,"copy_path(%s,%s)\n",truepath,translroot); -@@ -1575,7 +1575,7 @@ - struct stat reslvinfo; - instw_t iw; - char wpath[PATH_MAX+1]; -- size_t wsz=0; -+ ssize_t wsz=0; - char linkpath[PATH_MAX+1]; - - -@@ -2691,8 +2691,8 @@ - return result; - } - --int readlink(const char *path,char *buf,size_t bufsiz) { -- int result; -+ssize_t readlink(const char *path,char *buf,size_t bufsiz) { -+ ssize_t result; - instw_t instw; - int status; - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
