- crux-commits - lists.crux.nu

ports/core (2.3): openssh: update to 4.6p1
by crux＠crux.nu 11 Mar '07

11 Mar '07

commit b443aed7f19910fcce201716251e9d4b8ab3d4de Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 11 10:35:24 2007 +0100 openssh: update to 4.6p1 diff --git a/openssh/.md5sum b/openssh/.md5sum index f1a71b7..68c83b6 100644 --- a/openssh/.md5sum +++ b/openssh/.md5sum @@ -1,2 +1,2 @@ -6468c339886f78e8a149b88f695839dd openssh-4.5p1.tar.gz +6a7fa99f44d9e1b5b04d15256e1405bb openssh-4.6p1.tar.gz bd8c806e623552083e1a761019cc2793 sshd diff --git a/openssh/Pkgfile b/openssh/Pkgfile index 51f74dd..24d930d 100644 --- a/openssh/Pkgfile +++ b/openssh/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl, zlib name=openssh -version=4.5p1 +version=4.6p1 release=1 source=(ftp://openbsd.informatik.uni-erlangen.de/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd)

1 0

ports/core (2.3): Merge branch '2.2' into 2.3
by crux＠crux.nu 11 Mar '07

11 Mar '07

commit d20910a96030fdb17cc4cbb6dd285a6185a4ad2b Merge: 84f1aee... b443aed... Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 11 10:38:36 2007 +0100 Merge branch '2.2' into 2.3

1 0

ports/core (2.2): openssh: update to 4.6p1
by crux＠crux.nu 11 Mar '07

11 Mar '07

commit b443aed7f19910fcce201716251e9d4b8ab3d4de Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 11 10:35:24 2007 +0100 openssh: update to 4.6p1 diff --git a/openssh/.md5sum b/openssh/.md5sum index f1a71b7..68c83b6 100644 --- a/openssh/.md5sum +++ b/openssh/.md5sum @@ -1,2 +1,2 @@ -6468c339886f78e8a149b88f695839dd openssh-4.5p1.tar.gz +6a7fa99f44d9e1b5b04d15256e1405bb openssh-4.6p1.tar.gz bd8c806e623552083e1a761019cc2793 sshd diff --git a/openssh/Pkgfile b/openssh/Pkgfile index 51f74dd..24d930d 100644 --- a/openssh/Pkgfile +++ b/openssh/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl, zlib name=openssh -version=4.5p1 +version=4.6p1 release=1 source=(ftp://openbsd.informatik.uni-erlangen.de/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd)

1 0

ports/opt (2.3): Merge branch '2.2' into 2.3
by crux＠crux.nu 10 Mar '07

10 Mar '07

commit e1d028a6cff10c828153c4eac5bd78705ffeafd5 Merge: 8b8d7d8... c524025... Author: Juergen Daubert <jue(a)jue.li> Date: Sat Mar 10 10:09:28 2007 +0100 Merge branch '2.2' into 2.3

1 0

ports/opt (2.3): mysql: update to 5.0.37
by crux＠crux.nu 10 Mar '07

10 Mar '07

commit c52402599df654ffa3d22470df741bd8bd794ebc Author: Juergen Daubert <jue(a)jue.li> Date: Sat Mar 10 10:06:07 2007 +0100 mysql: update to 5.0.37 diff --git a/mysql/.footprint b/mysql/.footprint index 3748bcf..ae34b39 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -105,6 +105,7 @@ lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.15 -> libmysqlclient_r.so -rw-r--r-- root/root usr/lib/mysql/libvio.a drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/make_win_bin_dist.1.gz -rw-r--r-- root/root usr/man/man1/msql2mysql.1.gz -rw-r--r-- root/root usr/man/man1/my_print_defaults.1.gz -rw-r--r-- root/root usr/man/man1/myisam_ftdump.1.gz @@ -116,6 +117,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysql_config.1.gz -rw-r--r-- root/root usr/man/man1/mysql_explain_log.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_privilege_tables.1.gz +-rw-r--r-- root/root usr/man/man1/mysql_install_db.1.gz -rw-r--r-- root/root usr/man/man1/mysql_tzinfo_to_sql.1.gz -rw-r--r-- root/root usr/man/man1/mysql_upgrade.1.gz -rw-r--r-- root/root usr/man/man1/mysql_zap.1.gz @@ -130,6 +132,25 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysqlimport.1.gz -rw-r--r-- root/root usr/man/man1/mysqlman.1.gz -rw-r--r-- root/root usr/man/man1/mysqlshow.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_config.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_cpcd.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_delete_all.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_desc.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_drop_index.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_drop_table.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_error_reporter.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_mgm.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_mgmd.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_backup_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_schema_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_sys_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_restore.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_select_all.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_select_count.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_show_tables.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_size.pl.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_waiter.1.gz +-rw-r--r-- root/root usr/man/man1/ndbd.1.gz -rw-r--r-- root/root usr/man/man1/perror.1.gz -rw-r--r-- root/root usr/man/man1/replace.1.gz -rw-r--r-- root/root usr/man/man1/safe_mysqld.1.gz diff --git a/mysql/.md5sum b/mysql/.md5sum index ef5576f..59bee86 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ c92bf44516b82cad857fb386dbb64bfe my.cnf -10cb85276a1468c7906a4ff4dd565d61 mysql-5.0.33.tar.gz +26ed76facb58bdeae40c8310e337dde2 mysql-5.0.37.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index 8661632..b022b81 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses, zlib name=mysql -version=5.0.33 +version=5.0.37 release=1 source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \ my.cnf mysqld)

1 0

ports/opt (2.3): exim: added openssl patch
by crux＠crux.nu 10 Mar '07

10 Mar '07

commit 94a6a8ac5fff7fd6c6b95856970addbf9f6dd328 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Mar 7 18:32:10 2007 +0100 exim: added openssl patch diff --git a/exim/.md5sum b/exim/.md5sum index 1294ce0..fb0cd18 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,3 +1,4 @@ f1682811a7fd2897153c5b0e33177509 exim 01288e44919d8abdde5a7bd2c200449b exim-4.66.tar.bz2 f9edb79bd90e2b6e8233b2ef26e95aa9 exim-config.patch +600d6448d11289c479da7a7ce600ce31 exim-openssl.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index 5aac9a7..befb31b 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -5,13 +5,14 @@ name=exim version=4.66 -release=1 +release=2 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ - $name $name-config.patch) + $name $name-config.patch $name-openssl.patch) build() { cd $name-$version + patch -p1 < ../$name-openssl.patch sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1 cp src/EDITME Local/Makefile diff --git a/exim/exim-openssl.patch b/exim/exim-openssl.patch new file mode 100644 index 0000000..5d7e209 --- /dev/null +++ b/exim/exim-openssl.patch @@ -0,0 +1,17 @@ +diff -Nru exim-4.66.orig/src/tls-openssl.c exim-4.66/src/tls-openssl.c +--- exim-4.66.orig/src/tls-openssl.c 2007-02-28 20:33:35.527246099 +0000 ++++ exim-4.66/src/tls-openssl.c 2007-02-28 20:34:47.751361917 +0000 +@@ -343,8 +343,11 @@ + /* Set up the information callback, which outputs if debugging is at a suitable + level. */ + +-if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback))) +- return tls_error(US"SSL_CTX_set_info_callback", host); ++/* if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback))) ++ return tls_error(US"SSL_CTX_set_info_callback", host); */ ++ ++SSL_CTX_set_info_callback(ctx, (void (*)())info_callback); ++ + + /* The following patch was supplied by Robert Roselius */ +

1 0

ports/opt (2.2): mysql: update to 5.0.37
by crux＠crux.nu 10 Mar '07

10 Mar '07

commit c52402599df654ffa3d22470df741bd8bd794ebc Author: Juergen Daubert <jue(a)jue.li> Date: Sat Mar 10 10:06:07 2007 +0100 mysql: update to 5.0.37 diff --git a/mysql/.footprint b/mysql/.footprint index 3748bcf..ae34b39 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -105,6 +105,7 @@ lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.15 -> libmysqlclient_r.so -rw-r--r-- root/root usr/lib/mysql/libvio.a drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/make_win_bin_dist.1.gz -rw-r--r-- root/root usr/man/man1/msql2mysql.1.gz -rw-r--r-- root/root usr/man/man1/my_print_defaults.1.gz -rw-r--r-- root/root usr/man/man1/myisam_ftdump.1.gz @@ -116,6 +117,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysql_config.1.gz -rw-r--r-- root/root usr/man/man1/mysql_explain_log.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_privilege_tables.1.gz +-rw-r--r-- root/root usr/man/man1/mysql_install_db.1.gz -rw-r--r-- root/root usr/man/man1/mysql_tzinfo_to_sql.1.gz -rw-r--r-- root/root usr/man/man1/mysql_upgrade.1.gz -rw-r--r-- root/root usr/man/man1/mysql_zap.1.gz @@ -130,6 +132,25 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysqlimport.1.gz -rw-r--r-- root/root usr/man/man1/mysqlman.1.gz -rw-r--r-- root/root usr/man/man1/mysqlshow.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_config.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_cpcd.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_delete_all.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_desc.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_drop_index.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_drop_table.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_error_reporter.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_mgm.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_mgmd.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_backup_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_schema_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_print_sys_file.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_restore.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_select_all.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_select_count.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_show_tables.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_size.pl.1.gz +-rw-r--r-- root/root usr/man/man1/ndb_waiter.1.gz +-rw-r--r-- root/root usr/man/man1/ndbd.1.gz -rw-r--r-- root/root usr/man/man1/perror.1.gz -rw-r--r-- root/root usr/man/man1/replace.1.gz -rw-r--r-- root/root usr/man/man1/safe_mysqld.1.gz diff --git a/mysql/.md5sum b/mysql/.md5sum index ef5576f..59bee86 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ c92bf44516b82cad857fb386dbb64bfe my.cnf -10cb85276a1468c7906a4ff4dd565d61 mysql-5.0.33.tar.gz +26ed76facb58bdeae40c8310e337dde2 mysql-5.0.37.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index 8661632..b022b81 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses, zlib name=mysql -version=5.0.33 +version=5.0.37 release=1 source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \ my.cnf mysqld)

1 0

ports/opt (2.3): cairo: fixed dependencies
by crux＠crux.nu 09 Mar '07

09 Mar '07

commit 8b8d7d8c0e3f982cd8a33f461ffee0fc18735a1a Author: Simone Rota <sip(a)crux.nu> Date: Fri Mar 9 20:09:13 2007 +0000 cairo: fixed dependencies diff --git a/cairo/Pkgfile b/cairo/Pkgfile index 617a8f4..f4f1dc4 100644 --- a/cairo/Pkgfile +++ b/cairo/Pkgfile @@ -1,7 +1,7 @@ # Description: A 2D graphics library with support for multiple output devices # URL: http://www.cairographics.org/ # Maintainer: Matt Housh, jaeger at morpheus dot net -# Depends on: glitz +# Depends on: fontconfig, glitz, libpng, xorg-libxrender name=cairo version=1.2.6

1 0

ports/opt (2.3): wvdial: removed unused patch
by crux＠crux.nu 09 Mar '07

09 Mar '07

commit 88f831f4f0fa2bc53d1c79fb6ce8311f7315431e Author: Simone Rota <sip(a)crux.nu> Date: Fri Mar 9 19:56:33 2007 +0000 wvdial: removed unused patch diff --git a/wvdial/wvstreams-4.2.2-gcc41.patch b/wvdial/wvstreams-4.2.2-gcc41.patch deleted file mode 100644 index 4887771..0000000 --- a/wvdial/wvstreams-4.2.2-gcc41.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Nru wvstreams-4.2.2.orig/include/uniconfkey.h wvstreams-4.2.2/include/uniconfkey.h ---- wvstreams-4.2.2.orig/include/uniconfkey.h 2006-11-26 18:33:38.134167426 +0100 -+++ wvstreams-4.2.2/include/uniconfkey.h 2006-11-26 18:37:08.864296426 +0100 -@@ -113,7 +113,7 @@ - bool iswild() const; - - /** Returns true if the key has a trailing slash. */ -- bool UniConfKey::hastrailingslash() const; -+ bool hastrailingslash() const; - - /** - * Returns the number of segments in this path. -diff -Nru wvstreams-4.2.2.orig/include/wvhttppool.h wvstreams-4.2.2/include/wvhttppool.h ---- wvstreams-4.2.2.orig/include/wvhttppool.h 2006-11-26 18:33:38.214167426 +0100 -+++ wvstreams-4.2.2/include/wvhttppool.h 2006-11-26 18:39:30.294486426 +0100 -@@ -57,7 +57,7 @@ - WvString linkname; - WvUrl url; - -- WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url) -+ WvUrlLink(WvStringParm _linkname, WvStringParm _url) - : linkname(_linkname), url(_url) - {} - }; -diff -Nru wvstreams-4.2.2.orig/include/wvstring.h wvstreams-4.2.2/include/wvstring.h ---- wvstreams-4.2.2.orig/include/wvstring.h 2006-11-26 18:33:38.334167426 +0100 -+++ wvstreams-4.2.2/include/wvstring.h 2006-11-26 18:37:08.864296426 +0100 -@@ -393,7 +393,7 @@ - - protected: - void copy_constructor(const WvFastString &s); -- inline void WvString::construct(const char *_str) -+ inline void construct(const char *_str) - { - link(&nullbuf, _str); - -diff -Nru wvstreams-4.2.2.orig/include/wvx509.h wvstreams-4.2.2/include/wvx509.h ---- wvstreams-4.2.2.orig/include/wvx509.h 2006-11-26 18:33:38.384167426 +0100 -+++ wvstreams-4.2.2/include/wvx509.h 2006-11-26 18:37:08.864296426 +0100 -@@ -349,19 +349,19 @@ - * Set the Certificate to use X509v3, since that's all modern - * PKI uses anyways :) - */ -- void WvX509Mgr::set_version(); -+ void set_version(); - - /** - * Get and set the keyUsage field. - */ -- WvString WvX509Mgr::get_key_usage(); -- void WvX509Mgr::set_key_usage(WvStringParm values); -+ WvString get_key_usage(); -+ void set_key_usage(WvStringParm values); - - /** - * Get and set the extendedKeyUsage field. - */ -- WvString WvX509Mgr::get_ext_key_usage(); -- void WvX509Mgr::set_ext_key_usage(WvStringParm values); -+ WvString get_ext_key_usage(); -+ void set_ext_key_usage(WvStringParm values); - - /** - * Return the Subject alt name if it exists, and WvString::null if

1 0

ports/opt (2.2): exim: added openssl patch
by crux＠crux.nu 07 Mar '07

07 Mar '07

commit 94a6a8ac5fff7fd6c6b95856970addbf9f6dd328 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Mar 7 18:32:10 2007 +0100 exim: added openssl patch diff --git a/exim/.md5sum b/exim/.md5sum index 1294ce0..fb0cd18 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,3 +1,4 @@ f1682811a7fd2897153c5b0e33177509 exim 01288e44919d8abdde5a7bd2c200449b exim-4.66.tar.bz2 f9edb79bd90e2b6e8233b2ef26e95aa9 exim-config.patch +600d6448d11289c479da7a7ce600ce31 exim-openssl.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index 5aac9a7..befb31b 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -5,13 +5,14 @@ name=exim version=4.66 -release=1 +release=2 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ - $name $name-config.patch) + $name $name-config.patch $name-openssl.patch) build() { cd $name-$version + patch -p1 < ../$name-openssl.patch sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1 cp src/EDITME Local/Makefile diff --git a/exim/exim-openssl.patch b/exim/exim-openssl.patch new file mode 100644 index 0000000..5d7e209 --- /dev/null +++ b/exim/exim-openssl.patch @@ -0,0 +1,17 @@ +diff -Nru exim-4.66.orig/src/tls-openssl.c exim-4.66/src/tls-openssl.c +--- exim-4.66.orig/src/tls-openssl.c 2007-02-28 20:33:35.527246099 +0000 ++++ exim-4.66/src/tls-openssl.c 2007-02-28 20:34:47.751361917 +0000 +@@ -343,8 +343,11 @@ + /* Set up the information callback, which outputs if debugging is at a suitable + level. */ + +-if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback))) +- return tls_error(US"SSL_CTX_set_info_callback", host); ++/* if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback))) ++ return tls_error(US"SSL_CTX_set_info_callback", host); */ ++ ++SSL_CTX_set_info_callback(ctx, (void (*)())info_callback); ++ + + /* The following patch was supplied by Robert Roselius */ +

1 0