October 2007 - crux-commits

ports/opt (2.3): alsa-oss: updated to version 1.0.15
by crux＠crux.nu 16 Oct '07

16 Oct '07

commit baed3768e5888dd39d7cb72379da04031654cff0 Author: Matt Housh <jaeger(a)crux.nu> Date: Tue Oct 16 07:33:22 2007 -0500 alsa-oss: updated to version 1.0.15 diff --git a/alsa-oss/.md5sum b/alsa-oss/.md5sum index 39b4547..657ea6f 100644 --- a/alsa-oss/.md5sum +++ b/alsa-oss/.md5sum @@ -1 +1 @@ -a24475b978982ff8cb2f25be793c6b83 alsa-oss-1.0.14.tar.bz2 +49fb5fbae8bf955b248e46ff9c9a2aa1 alsa-oss-1.0.15.tar.bz2 diff --git a/alsa-oss/Pkgfile b/alsa-oss/Pkgfile index 4832b75..16500a5 100644 --- a/alsa-oss/Pkgfile +++ b/alsa-oss/Pkgfile @@ -4,7 +4,7 @@ # Depends on: alsa-lib name=alsa-oss -version=1.0.14 +version=1.0.15 release=1 source=(ftp://ftp.alsa-project.org/pub/oss-lib/$name-$version.tar.bz2)

1 0

ports/opt (2.3): alsa-utils: updated to version 1.0.15
by crux＠crux.nu 16 Oct '07

16 Oct '07

commit ed6cdd992c1637ac2ef9b9c10b17e51b3609f66d Author: Matt Housh <jaeger(a)crux.nu> Date: Tue Oct 16 07:36:27 2007 -0500 alsa-utils: updated to version 1.0.15 diff --git a/alsa-utils/.md5sum b/alsa-utils/.md5sum index bfb5ff4..c97868d 100644 --- a/alsa-utils/.md5sum +++ b/alsa-utils/.md5sum @@ -1,2 +1,2 @@ -6d3009c157ac6fc803696d6590a48366 alsa-utils-1.0.14.tar.bz2 +287f46f891581c15018de4f8c0731575 alsa-utils-1.0.15.tar.bz2 7ca87ae2d727887898e1feb47a48d3f9 rc.alsa diff --git a/alsa-utils/Pkgfile b/alsa-utils/Pkgfile index 835891a..5a58eef 100644 --- a/alsa-utils/Pkgfile +++ b/alsa-utils/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gettext, alsa-lib, dialog name=alsa-utils -version=1.0.14 +version=1.0.15 release=1 source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2 \ rc.alsa)

1 0

ports/opt (2.3): alsa-lib: updated to version 1.0.15
by crux＠crux.nu 16 Oct '07

16 Oct '07

commit 7a2617ec78877fed761606f8562182a1ea37bd08 Author: Matt Housh <jaeger(a)crux.nu> Date: Tue Oct 16 07:32:19 2007 -0500 alsa-lib: updated to version 1.0.15 diff --git a/alsa-lib/.footprint b/alsa-lib/.footprint index 6bb8bd0..c602891 100644 --- a/alsa-lib/.footprint +++ b/alsa-lib/.footprint @@ -83,6 +83,7 @@ drwxr-xr-x root/root usr/share/alsa/cards/ -rw-r--r-- root/root usr/share/alsa/cards/CMI8338.conf -rw-r--r-- root/root usr/share/alsa/cards/CMI8738-MC6.conf -rw-r--r-- root/root usr/share/alsa/cards/CMI8738-MC8.conf +-rw-r--r-- root/root usr/share/alsa/cards/CMI8788.conf -rw-r--r-- root/root usr/share/alsa/cards/CS46xx.conf -rw-r--r-- root/root usr/share/alsa/cards/EMU10K1.conf -rw-r--r-- root/root usr/share/alsa/cards/EMU10K1X.conf @@ -102,6 +103,7 @@ drwxr-xr-x root/root usr/share/alsa/cards/ -rw-r--r-- root/root usr/share/alsa/cards/PC-Speaker.conf -rw-r--r-- root/root usr/share/alsa/cards/PMac.conf -rw-r--r-- root/root usr/share/alsa/cards/PMacToonie.conf +-rw-r--r-- root/root usr/share/alsa/cards/PS3.conf -rw-r--r-- root/root usr/share/alsa/cards/RME9636.conf -rw-r--r-- root/root usr/share/alsa/cards/RME9652.conf -rw-r--r-- root/root usr/share/alsa/cards/SI7018.conf diff --git a/alsa-lib/.md5sum b/alsa-lib/.md5sum index 3379747..181fa2f 100644 --- a/alsa-lib/.md5sum +++ b/alsa-lib/.md5sum @@ -1 +1 @@ -72dc63821ce33f2b97a151a909b06ff8 alsa-lib-1.0.14a.tar.bz2 +94254ea0d2c966a58184b134e9da29ff alsa-lib-1.0.15.tar.bz2 diff --git a/alsa-lib/Pkgfile b/alsa-lib/Pkgfile index 8f77b22..e89edc8 100644 --- a/alsa-lib/Pkgfile +++ b/alsa-lib/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net name=alsa-lib -version=1.0.14a +version=1.0.15 release=1 source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2)

1 0

ports/opt (2.3): netpbm: updated to 10.35.32
by crux＠crux.nu 14 Oct '07

14 Oct '07

commit 413fdfaf006e5e32813ec2e8739cae6eef625519 Author: Antti Nykanen <aon(a)iki.fi> Date: Sun Oct 14 15:28:20 2007 +0300 netpbm: updated to 10.35.32 diff --git a/netpbm/.md5sum b/netpbm/.md5sum index ec53968..ab573c6 100644 --- a/netpbm/.md5sum +++ b/netpbm/.md5sum @@ -1,2 +1,2 @@ 5aa32e99a1e58adbbd28928d1086183e Makefile.config -9162e00612c18d761fa8995924675034 netpbm-10.35.31.tar.gz +5b0b463686e04022a0083f3b6a962657 netpbm-10.35.32.tar.gz diff --git a/netpbm/Pkgfile b/netpbm/Pkgfile index 1d9baac..3adbf39 100644 --- a/netpbm/Pkgfile +++ b/netpbm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ghostscript name=netpbm -version=10.35.31 +version=10.35.32 release=1 source=(http://aon.iki.fi/files/netpbm/netpbm-$version.tar.gz Makefile.config)

1 0

ports/opt (2.3): wine: updated to 0.9.47
by crux＠crux.nu 14 Oct '07

14 Oct '07

commit 007be1c08ee95df6444bad0d1f60071733877dae Author: Antti Nykanen <aon(a)iki.fi> Date: Sun Oct 14 15:28:03 2007 +0300 wine: updated to 0.9.47 diff --git a/wine/.footprint b/wine/.footprint index b183c57..ea22824 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -131,7 +131,9 @@ drwxr-xr-x root/root usr/include/wine/windows/ -rw-r--r-- root/root usr/include/wine/windows/d3drmdef.h -rw-r--r-- root/root usr/include/wine/windows/d3dtypes.h -rw-r--r-- root/root usr/include/wine/windows/d3dvec.inl +-rw-r--r-- root/root usr/include/wine/windows/d3dx8.h -rw-r--r-- root/root usr/include/wine/windows/d3dx8core.h +-rw-r--r-- root/root usr/include/wine/windows/d3dx8math.h -rw-r--r-- root/root usr/include/wine/windows/dbghelp.h -rw-r--r-- root/root usr/include/wine/windows/dbinit.idl -rw-r--r-- root/root usr/include/wine/windows/dbprop.idl @@ -768,6 +770,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/msisys.ocx.so -rwxr-xr-x root/root usr/lib/wine/msnet32.dll.so -rwxr-xr-x root/root usr/lib/wine/msrle32.dll.so +-rwxr-xr-x root/root usr/lib/wine/msvcirt.dll.so -rwxr-xr-x root/root usr/lib/wine/msvcrt.dll.so -rwxr-xr-x root/root usr/lib/wine/msvcrt20.dll.so -rwxr-xr-x root/root usr/lib/wine/msvcrt40.dll.so @@ -814,6 +817,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/psapi.dll.so -rwxr-xr-x root/root usr/lib/wine/pstorec.dll.so -rwxr-xr-x root/root usr/lib/wine/qcap.dll.so +-rwxr-xr-x root/root usr/lib/wine/qmgr.dll.so -rwxr-xr-x root/root usr/lib/wine/quartz.dll.so -rwxr-xr-x root/root usr/lib/wine/query.dll.so -rw-r--r-- root/root usr/lib/wine/rasapi16.dll16 @@ -989,6 +993,8 @@ drwxr-xr-x root/root usr/share/wine/fonts/ -rw-r--r-- root/root usr/share/wine/fonts/sserifer.fon -rw-r--r-- root/root usr/share/wine/fonts/sserifet.fon -rw-r--r-- root/root usr/share/wine/fonts/svgasys.fon +-rw-r--r-- root/root usr/share/wine/fonts/tahoma.ttf +-rw-r--r-- root/root usr/share/wine/fonts/tahomabd.ttf -rw-r--r-- root/root usr/share/wine/fonts/vgas1255.fon -rw-r--r-- root/root usr/share/wine/fonts/vgas1256.fon -rw-r--r-- root/root usr/share/wine/fonts/vgas1257.fon diff --git a/wine/.md5sum b/wine/.md5sum index da06818..87ae728 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1 @@ -aa729097ddb324185a3e092b37a5f9fe wine-0.9.46.tar.bz2 +dfeeb7c137a1abab917f82dafbef5c8a wine-0.9.47.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index 35b8bf2..73a94db 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontforge name=wine -version=0.9.46 +version=0.9.47 release=1 source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.ta…

1 0

ports/opt (2.3): libpng: updated to 1.2.22.
by crux＠crux.nu 14 Oct '07

14 Oct '07

commit b695c366d561f521f190a5f452a83130f8d56911 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sun Oct 14 10:42:39 2007 +0200 libpng: updated to 1.2.22. diff --git a/libpng/.footprint b/libpng/.footprint index 0433834..3148402 100644 --- a/libpng/.footprint +++ b/libpng/.footprint @@ -12,13 +12,13 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpng.a -> libpng12.a lrwxrwxrwx root/root usr/lib/libpng.la -> libpng12.la lrwxrwxrwx root/root usr/lib/libpng.so -> libpng12.so -lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.21.0 --rwxr-xr-x root/root usr/lib/libpng.so.3.21.0 +lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.22.0 +-rwxr-xr-x root/root usr/lib/libpng.so.3.22.0 -rw-r--r-- root/root usr/lib/libpng12.a -rwxr-xr-x root/root usr/lib/libpng12.la -lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0.21.0 -lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.21.0 --rwxr-xr-x root/root usr/lib/libpng12.so.0.21.0 +lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0.22.0 +lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.22.0 +-rwxr-xr-x root/root usr/lib/libpng12.so.0.22.0 drwxr-xr-x root/root usr/lib/pkgconfig/ lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng12.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpng12.pc diff --git a/libpng/.md5sum b/libpng/.md5sum index 93fbbe1..9068345 100644 --- a/libpng/.md5sum +++ b/libpng/.md5sum @@ -1 +1 @@ -b0cda5e10e8165e5f151e674e1a67983 libpng-1.2.21.tar.bz2 +e50208ad684a5822c74b8a260962a4d4 libpng-1.2.22.tar.bz2 diff --git a/libpng/Pkgfile b/libpng/Pkgfile index a191c97..6c43d75 100644 --- a/libpng/Pkgfile +++ b/libpng/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=libpng -version=1.2.21 +version=1.2.22 release=1 source=(ftp://ftp.simplesystems.org/pub/$name/png/src/$name-$version.tar.bz…

1 0

ports/opt (2.3): quota: adjusted /etc/quota paths in comments
by crux＠crux.nu 12 Oct '07

12 Oct '07

commit 637dcb764903f3ce2c9af56c7d2e29ad905d9ab7 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Oct 12 12:54:31 2007 +0200 quota: adjusted /etc/quota paths in comments diff --git a/quota/Pkgfile b/quota/Pkgfile index b52e4fc..69b01a0 100644 --- a/quota/Pkgfile +++ b/quota/Pkgfile @@ -5,7 +5,7 @@ name=quota version=3.15 -release=1 +release=2 source=(http://dl.sourceforge.net/sourceforge/linuxquota/$name-$version.tar… \ warnquota.conf ${name}_tcp_wrappers.patch) @@ -24,4 +24,5 @@ build(){ make make install ROOTDIR=$PKG install -D -m 644 $SRC/warnquota.conf $PKG/etc/quota/warnquota.conf + find $PKG/etc/quota -type f | xargs sed -i 's|/etc|/etc/quota|' }

1 0

ports/core (2.4): openssl: updated to 0.9.8f.
by crux＠crux.nu 12 Oct '07

12 Oct '07

commit 4837a9ce399d751d3d4a1b4cf23173380fbc0ea2 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Fri Oct 12 11:29:41 2007 +0200 openssl: updated to 0.9.8f. diff --git a/openssl/.footprint b/openssl/.footprint index de384e1..e0b7a38 100644 --- a/openssl/.footprint +++ b/openssl/.footprint @@ -1118,5 +1118,4 @@ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/config.5ssl.gz -rw-r--r-- root/root usr/man/man5/x509v3_config.5ssl.gz drwxr-xr-x root/root usr/man/man7/ -lrwxrwxrwx root/root usr/man/man7/Modes_of_DES.7ssl.gz -> des_modes.7ssl.gz -rw-r--r-- root/root usr/man/man7/des_modes.7ssl.gz diff --git a/openssl/.md5sum b/openssl/.md5sum index e04c40f..5bb506c 100644 --- a/openssl/.md5sum +++ b/openssl/.md5sum @@ -1,6 +1,3 @@ -30ad2995a2668db16ae3083c11a42307 CVE-2007-3108.patch -21119cb0b942c835395d7f57530ba14a CVE-2007-5135.patch 9d0df57845af8acd1027a7df5c18d017 mksslcert.sh -3cbccf8f5d7ce488a306fb9029512b80 openssl-0.9.8-gcc42.patch 58daa890c3bc19bd6ce3451b2e5e335c openssl-0.9.8b-parallel-build.patch -3a7ff24f6ea5cd711984722ad654b927 openssl-0.9.8e.tar.gz +114bf908eb1b293d11d3e6b18a09269f openssl-0.9.8f.tar.gz diff --git a/openssl/CVE-2007-3108.patch b/openssl/CVE-2007-3108.patch deleted file mode 100644 index abf0196..0000000 --- a/openssl/CVE-2007-3108.patch +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -- --- openssl-0.9.8e/crypto/bn/bn_mont.c 2006-06-16 03:01:14.000000000 +0200 -+++ openssl-0.9.8-cvs/crypto/bn/bn_mont.c 2007-06-29 10:13:25.000000000 +0200 -@@ -176,7 +176,6 @@ - - max=(nl+al+1); /* allow for overflow (no?) XXX */ - if (bn_wexpand(r,max) == NULL) goto err; -- - if (bn_wexpand(ret,max) == NULL) goto err; - - r->neg=a->neg^n->neg; - np=n->d; -@@ -228,19 +227,70 @@ - } - bn_correct_top(r); - -- - /* mont->ri will be a multiple of the word size */ -- -#if 0 -- - BN_rshift(ret,r,mont->ri); -- -#else -- - ret->neg = r->neg; -- - x=ri; -+ /* mont->ri will be a multiple of the word size and below code -+ * is kind of BN_rshift(ret,r,mont->ri) equivalent */ -+ if (r->top <= ri) -+ { -+ ret->top=0; -+ retn=1; -+ goto err; -+ } -+ al=r->top-ri; -+ -+# define BRANCH_FREE 1 -+# if BRANCH_FREE -+ if (bn_wexpand(ret,ri) == NULL) goto err; -+ x=0-(((al-ri)>>(sizeof(al)*8-1))&1); -+ ret->top=x=(ri&~x)|(al&x); /* min(ri,al) */ -+ ret->neg=r->neg; -+ - rp=ret->d; -- - ap= &(r->d[x]); -- - if (r->top < x) -- - al=0; -- - else -- - al=r->top-x; -+ ap=&(r->d[ri]); -+ -+ { -+ size_t m1,m2; -+ -+ v=bn_sub_words(rp,ap,np,ri); -+ /* this ----------------^^ works even in al<ri case -+ * thanks to zealous zeroing of top of the vector in the -+ * beginning. */ -+ -+ /* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */ -+ /* in other words if subtraction result is real, then -+ * trick unconditional memcpy below to perform in-place -+ * "refresh" instead of actual copy. */ -+ m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1); /* al<ri */ -+ m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1); /* al>ri */ -+ m1|=m2; /* (al!=ri) */ -+ m1|=(0-(size_t)v); /* (al!=ri || v) */ -+ m1&=~m2; /* (al!=ri || v) && !al>ri */ -+ nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1)); -+ } -+ -+ /* 'i<ri' is chosen to eliminate dependency on input data, even -+ * though it results in redundant copy in al<ri case. */ -+ for (i=0,ri-=4; i<ri; i+=4) -+ { -+ BN_ULONG t1,t2,t3,t4; -+ -+ t1=nrp[i+0]; -+ t2=nrp[i+1]; -+ t3=nrp[i+2]; ap[i+0]=0; -+ t4=nrp[i+3]; ap[i+1]=0; -+ rp[i+0]=t1; ap[i+2]=0; -+ rp[i+1]=t2; ap[i+3]=0; -+ rp[i+2]=t3; -+ rp[i+3]=t4; -+ } -+ for (ri+=4; i<ri; i++) -+ rp[i]=nrp[i], ap[i]=0; -+# else -+ if (bn_wexpand(ret,al) == NULL) goto err; - ret->top=al; -+ ret->neg=r->neg; -+ -+ rp=ret->d; -+ ap=&(r->d[ri]); - al-=4; - for (i=0; i<al; i+=4) - { -@@ -258,7 +308,7 @@ - al+=4; - for (; i<al; i++) - rp[i]=ap[i]; -- -#endif -+# endif - #else /* !MONT_WORD */ - BIGNUM *t1,*t2; - -@@ -278,10 +328,12 @@ - if (!BN_rshift(ret,t2,mont->ri)) goto err; - #endif /* MONT_WORD */ - -+#if !defined(BRANCH_FREE) || BRANCH_FREE==0 - if (BN_ucmp(ret, &(mont->N)) >= 0) - { - if (!BN_usub(ret,ret,&(mont->N))) goto err; - } -+#endif - retn=1; - bn_check_top(ret); - err: ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iQCVAwUBRrGk++6tTP1JpWPZAQJbjwP/W/6mROtxOVU1gvvq/uFHCytNWHVaJfKA -7zh+v4OPQEIYekIBkEpNFgTJbHcyIZoyDNnwOetkRXvI4LDqvV1V5/pA5bzrKqDj -zv7Hj8R7DGqG8ad0Esf3l7SqqirI3curkIzm5/cALJBJxz/Pp7qyXNzzQgp55UPz -iBDdynBpa+s= -=aquq ------END PGP SIGNATURE----- diff --git a/openssl/CVE-2007-5135.patch b/openssl/CVE-2007-5135.patch deleted file mode 100644 index ed3b0fd..0000000 --- a/openssl/CVE-2007-5135.patch +++ /dev/null @@ -1,46 +0,0 @@ -openssl/ssl/ssl_lib.c 1.133.2.9 -> 1.133.2.10 - ---- ssl_lib.c 2007/08/12 18:59:02 1.133.2.9 -+++ ssl_lib.c 2007/09/19 12:16:21 1.133.2.10 -@@ -1210,7 +1210,6 @@ - char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) - { - char *p; -- const char *cp; - STACK_OF(SSL_CIPHER) *sk; - SSL_CIPHER *c; - int i; -@@ -1223,20 +1222,21 @@ - sk=s->session->ciphers; - for (i=0; i<sk_SSL_CIPHER_num(sk); i++) - { -- /* Decrement for either the ':' or a '\0' */ -- len--; -+ int n; -+ - c=sk_SSL_CIPHER_value(sk,i); -- for (cp=c->name; *cp; ) -+ n=strlen(c->name); -+ if (n+1 > len) - { -- if (len-- <= 0) -- { -- *p='\0'; -- return(buf); -- } -- else -- *(p++)= *(cp++); -+ if (p != buf) -+ --p; -+ *p='\0'; -+ return buf; - } -+ strcpy(p,c->name); -+ p+=n; - *(p++)=':'; -+ len-=n+1; - } - p[-1]='\0'; - return(buf); - - diff --git a/openssl/Pkgfile b/openssl/Pkgfile index 26dce35..f072fbd 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -3,19 +3,14 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=openssl -version=0.9.8e -release=3 +version=0.9.8f +release=1 source=(http://www.openssl.org/source/$name-$version.tar.gz \ - mksslcert.sh openssl-0.9.8b-parallel-build.patch \ - CVE-2007-3108.patch CVE-2007-5135.patch \ - openssl-0.9.8-gcc42.patch) + mksslcert.sh openssl-0.9.8b-parallel-build.patch) build() { cd $name-$version - patch -p1 -i $SRC/CVE-2007-3108.patch - patch -p0 -d ssl -i $SRC/CVE-2007-5135.patch patch -p1 -i $SRC/openssl-0.9.8b-parallel-build.patch - patch -p0 -i $SRC/openssl-0.9.8-gcc42.patch ./config --prefix=/usr --openssldir=/etc/ssl shared make make INSTALL_PREFIX=$PKG MANDIR=/usr/man MANSUFFIX=ssl install diff --git a/openssl/openssl-0.9.8-gcc42.patch b/openssl/openssl-0.9.8-gcc42.patch deleted file mode 100644 index 5691aae..0000000 --- a/openssl/openssl-0.9.8-gcc42.patch +++ /dev/null @@ -1,261 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429740 - ---- crypto/asn1/asn1.h~ 2007-04-14 19:00:19.000000000 +0100 -+++ crypto/asn1/asn1.h 2007-05-16 14:48:27.000000000 +0100 -@@ -329,6 +329,17 @@ typedef struct ASN1_VALUE_st ASN1_VALUE; - #define I2D_OF(type) int (*)(type *,unsigned char **) - #define I2D_OF_const(type) int (*)(const type *,unsigned char **) - -+#define CHECKED_D2I_OF(type, d2i) \ -+ ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0))) -+#define CHECKED_I2D_OF(type, i2d) \ -+ ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0))) -+#define CHECKED_NEW_OF(type, xnew) \ -+ ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0))) -+#define CHECKED_PTR_OF(type, p) \ -+ ((void*) (1 ? p : (type*)0)) -+#define CHECKED_PPTR_OF(type, p) \ -+ ((void**) (1 ? p : (type**)0)) -+ - #define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long) - #define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **) - #define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type) -@@ -914,23 +925,41 @@ int ASN1_object_size(int constructed, in - - /* Used to implement other functions */ - void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x); -+ - #define ASN1_dup_of(type,i2d,d2i,x) \ -- ((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x) -+ ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \ -+ CHECKED_D2I_OF(type, d2i), \ -+ CHECKED_PTR_OF(type, x))) -+ - #define ASN1_dup_of_const(type,i2d,d2i,x) \ -- ((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x) -+ ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \ -+ CHECKED_D2I_OF(type, d2i), \ -+ CHECKED_PTR_OF(const type, x))) - - void *ASN1_item_dup(const ASN1_ITEM *it, void *x); - - #ifndef OPENSSL_NO_FP_API - void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x); -+ - #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \ -- ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x) -+ ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \ -+ CHECKED_D2I_OF(type, d2i), \ -+ in, \ -+ CHECKED_PPTR_OF(type, x))) -+ - void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x); - int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x); -+ - #define ASN1_i2d_fp_of(type,i2d,out,x) \ -- ((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x) -+ (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \ -+ out, \ -+ CHECKED_PTR_OF(type, x))) -+ - #define ASN1_i2d_fp_of_const(type,i2d,out,x) \ -- ((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x) -+ (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \ -+ out, \ -+ CHECKED_PTR_OF(const type, x))) -+ - int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x); - int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags); - #endif -@@ -939,14 +968,26 @@ int ASN1_STRING_to_UTF8(unsigned char ** - - #ifndef OPENSSL_NO_BIO - void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x); -+ - #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \ -- ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x) -+ ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \ -+ CHECKED_D2I_OF(type, d2i), \ -+ in, \ -+ CHECKED_PPTR_OF(type, x))) -+ - void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x); - int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x); -+ - #define ASN1_i2d_bio_of(type,i2d,out,x) \ -- ((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x) -+ (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \ -+ out, \ -+ CHECKED_PTR_OF(type, x))) -+ - #define ASN1_i2d_bio_of_const(type,i2d,out,x) \ -- ((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x) -+ (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \ -+ out, \ -+ CHECKED_PTR_OF(const type, x))) -+ - int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x); - int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a); - int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a); -@@ -983,8 +1024,12 @@ void *ASN1_unpack_string(ASN1_STRING *oc - void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it); - ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, - ASN1_OCTET_STRING **oct); -+ - #define ASN1_pack_string_of(type,obj,i2d,oct) \ -- ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct) -+ (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \ -+ CHECKED_I2D_OF(type, i2d), \ -+ oct)) -+ - ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct); - - void ASN1_STRING_set_default_mask(unsigned long mask); ---- crypto/pem/pem.h~ 2007-04-05 18:00:52.000000000 +0100 -+++ crypto/pem/pem.h 2007-05-16 14:48:42.000000000 +0100 -@@ -221,19 +221,28 @@ typedef struct pem_ctx_st - #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \ - type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\ - { \ --return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \ -+ return (type*)PEM_ASN1_read(CHECKED_D2I_OF(type, d2i_##asn1), \ -+ str, fp, \ -+ CHECKED_PPTR_OF(type, x), \ -+ cb, u); \ - } - - #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \ - int PEM_write_##name(FILE *fp, type *x) \ - { \ --return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ -+ return PEM_ASN1_write(CHECKED_I2D_OF(type, i2d_##asn1), \ -+ str, fp, \ -+ CHECKED_PTR_OF(type, x), \ -+ NULL, NULL, 0, NULL, NULL); \ - } - - #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \ - int PEM_write_##name(FILE *fp, const type *x) \ - { \ --return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \ -+ return PEM_ASN1_write(CHECKED_I2D_OF(const type, i2d_##asn1), \ -+ str, fp, \ -+ CHECKED_PTR_OF(const type, x), \ -+ NULL, NULL, 0, NULL, NULL); \ - } - - #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \ -@@ -241,7 +250,10 @@ int PEM_write_##name(FILE *fp, type *x, - unsigned char *kstr, int klen, pem_password_cb *cb, \ - void *u) \ - { \ -- return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ -+ return PEM_ASN1_write(CHECKED_I2D_OF(type, i2d_##asn1), \ -+ str, fp, \ -+ CHECKED_PTR_OF(type, x), \ -+ enc, kstr, klen, cb, u); \ - } - - #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \ -@@ -249,7 +261,10 @@ int PEM_write_##name(FILE *fp, type *x, - unsigned char *kstr, int klen, pem_password_cb *cb, \ - void *u) \ - { \ -- return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \ -+ return PEM_ASN1_write(CHECKED_I2D_OF(const type, i2d_##asn1), \ -+ str, fp, \ -+ CHECKED_PTR_OF(const type, x), \ -+ enc, kstr, klen, cb, u); \ - } - - #endif -@@ -257,33 +272,48 @@ int PEM_write_##name(FILE *fp, type *x, - #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \ - type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\ - { \ --return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \ -+ return (type*)PEM_ASN1_read_bio(CHECKED_D2I_OF(type, d2i_##asn1), \ -+ str, bp, \ -+ CHECKED_PPTR_OF(type, x), \ -+ cb, u); \ - } - - #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \ - int PEM_write_bio_##name(BIO *bp, type *x) \ - { \ --return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ -+ return PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d_##asn1), \ -+ str, bp, \ -+ CHECKED_PTR_OF(type, x), \ -+ NULL, NULL, 0, NULL, NULL); \ - } - - #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \ - int PEM_write_bio_##name(BIO *bp, const type *x) \ - { \ --return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \ -+ return PEM_ASN1_write_bio(CHECKED_I2D_OF(const type, i2d_##asn1), \ -+ str, bp, \ -+ CHECKED_PTR_OF(const type, x), \ -+ NULL, NULL, 0, NULL, NULL); \ - } - - #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \ - int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ - unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ - { \ -- return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ -+ return PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d_##asn1), \ -+ str, bp, \ -+ CHECKED_PTR_OF(type, x), \ -+ enc, kstr, klen, cb, u); \ - } - - #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \ - int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ - unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \ - { \ -- return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \ -+ return PEM_ASN1_write_bio(CHECKED_I2D_OF(const type, i2d_##asn1), \ -+ str, bp, \ -+ CHECKED_PTR_OF(const type, x), \ -+ enc, kstr, klen, cb, u); \ - } - - #define IMPLEMENT_PEM_write(name, type, str, asn1) \ -@@ -414,13 +444,22 @@ int PEM_bytes_read_bio(unsigned char **p - pem_password_cb *cb, void *u); - void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, - void **x, pem_password_cb *cb, void *u); -+ - #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \ --((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u) -+ ((type*)PEM_ASN1_read_bio(CHECKED_D2I_OF(type, d2i), \ -+ name, bp, \ -+ CHECKED_PPTR_OF(type, x), \ -+ cb, u)) -+ - int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x, - const EVP_CIPHER *enc,unsigned char *kstr,int klen, - pem_password_cb *cb, void *u); -+ - #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \ -- ((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u) -+ (PEM_ASN1_write_bio(CHECKED_I2D_OF(type, i2d), \ -+ name, bp, \ -+ CHECKED_PTR_OF(type, x), \ -+ enc, kstr, klen, cb, u)) - - STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); - int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc, ---- crypto/ocsp/ocsp.h -+++ crypto/ocsp/ocsp.h -@@ -469,7 +469,7 @@ - ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, - void *data, STACK_OF(ASN1_OBJECT) *sk); - #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \ --((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk) -+ ASN1_STRING_encode(s, CHECKED_I2D_OF(type, i2d), data, sk) - - X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim); -

1 0

ports/core (2.4): Merge branch '2.3' into 2.4
by crux＠crux.nu 12 Oct '07

12 Oct '07

commit a46afd4652b149af3bd25f8fb8f613a6a526bdde Merge: f7e1f2b... 187a5f8... Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Fri Oct 12 11:25:58 2007 +0200 Merge branch '2.3' into 2.4

1 0

ports/core (2.4): tar: updated to 1.19.
by crux＠crux.nu 12 Oct '07

12 Oct '07

commit 2b2cbe752f97430e45a8b0c214501586867c5bbe Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Thu Oct 11 16:23:30 2007 +0200 tar: updated to 1.19. diff --git a/tar/.md5sum b/tar/.md5sum index aa143a2..fa3b46d 100644 --- a/tar/.md5sum +++ b/tar/.md5sum @@ -1,4 +1,4 @@ 6a56bc4bb64fc9bb48d28e66a30ad937 rmt.8 -70170208d7c1bb9ab40120579434b6a3 tar-1.18.tar.bz2 +bcc2e19b19823b9ab68c94586067a792 tar-1.19.tar.bz2 e4038247fa36a51d2784e163f58f6e38 tar-rootp.patch 7c2293e8c051ade56db42daf2279e5eb tar.1 diff --git a/tar/Pkgfile b/tar/Pkgfile index 5683aea..92b1661 100644 --- a/tar/Pkgfile +++ b/tar/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=tar -version=1.18 +version=1.19 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 \ $name-rootp.patch tar.1 rmt.8)

1 0