From 6821efbeea6329bdb5237f2dfc411beea9639448 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Nov 2010 08:31:35 +0100 Subject: [PATCH] Bump revision and fixes for pkgs requiring libssl. --- srcpkgs/apache/template | 3 ++- srcpkgs/apr-util/apr-util-mysql.template | 4 +++- srcpkgs/curl/libcurl.template | 3 ++- srcpkgs/cyrus-sasl/cyrus-sasl-modules.template | 4 +++- srcpkgs/cyrus-sasl/template | 3 ++- srcpkgs/git/template | 4 +++- srcpkgs/gnome-vfs/template | 4 +++- srcpkgs/heimdal/heimdal-libs.template | 4 ++-- srcpkgs/heimdal/template | 4 ++-- srcpkgs/irssi/template | 4 +++- srcpkgs/lftp/template | 8 ++++---- srcpkgs/libarchive/bsdcpio.template | 7 ++----- srcpkgs/libarchive/bsdtar.template | 7 ++----- srcpkgs/libarchive/template | 4 ++-- srcpkgs/libldap/template | 3 ++- srcpkgs/mit-krb5/template | 3 ++- srcpkgs/mysql/libmysqlclient.template | 4 +++- srcpkgs/mysql/mysql-client.template | 4 ++-- srcpkgs/mysql/template | 4 ++-- srcpkgs/netpgp/libnetpgp.template | 4 +++- srcpkgs/netpgp/template | 4 +++- srcpkgs/ntp/ntp-perl.template | 2 -- srcpkgs/ntp/template | 11 +++++------ srcpkgs/openssh/openssh-client.template | 4 ++-- srcpkgs/openssh/openssh-server.template | 4 +++- srcpkgs/openssh/template | 4 ++-- srcpkgs/postgresql/postgresql-client.template | 4 +++- srcpkgs/postgresql/postgresql-libs.template | 4 +++- srcpkgs/postgresql/template | 3 ++- srcpkgs/python/template | 4 ++-- srcpkgs/qemu/template | 4 +++- srcpkgs/qt/template | 3 ++- .../rsyslog/patches/librsyslog_link_to_libz.diff | 14 ++++++++++++++ srcpkgs/rsyslog/rsyslog-mysql.template | 4 +++- srcpkgs/ruby/template | 4 +++- srcpkgs/sylpheed/template | 3 ++- srcpkgs/transmission/template | 3 ++- srcpkgs/wget/template | 8 +++++--- srcpkgs/wpa_supplicant/template | 4 ++-- srcpkgs/xbps-devel/template | 2 +- srcpkgs/xbps/patches/fix_ld_as_needed_order.diff | 13 +++++++++++++ srcpkgs/xbps/template | 4 +++- srcpkgs/xorg-server/template | 4 ++-- 43 files changed, 129 insertions(+), 70 deletions(-) create mode 100644 srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff create mode 100644 srcpkgs/xbps/patches/fix_ld_as_needed_order.diff diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 28ed93776b..a868cc8aaf 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,6 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.2.15 +revision=1 wrksrc=httpd-${version} distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" build_style=gnu_configure @@ -63,7 +64,7 @@ Add_dependency run db Add_dependency run gdbm Add_dependency run expat Add_dependency run libldap -Add_dependency run openssl +Add_dependency run libssl Add_dependency run apr Add_dependency run apr-util diff --git a/srcpkgs/apr-util/apr-util-mysql.template b/srcpkgs/apr-util/apr-util-mysql.template index b31bbeb13b..31cbdaaa4f 100644 --- a/srcpkgs/apr-util/apr-util-mysql.template +++ b/srcpkgs/apr-util/apr-util-mysql.template @@ -6,9 +6,11 @@ long_desc=" This packages contains the APR Utility module for MySQL." +revision=1 + Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libmysqlclient Add_dependency run apr-util diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template index 8758378bce..0f74604500 100644 --- a/srcpkgs/curl/libcurl.template +++ b/srcpkgs/curl/libcurl.template @@ -9,12 +9,13 @@ long_desc=" user+password authentication (Basic, Digest, NTLM, Negotiate, Kerberos4), file transfer resume, http proxy tunneling and more!" +revision=1 replaces="curl-libs<7.20.1" Add_dependency run glibc Add_dependency run libidn Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libldap Add_dependency run mit-krb5-libs Add_dependency run e2fsprogs-libs diff --git a/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template b/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template index 790a6e2563..9dcaadaf58 100644 --- a/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template +++ b/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template @@ -8,8 +8,10 @@ long_desc=" This package provides the following SASL modules: LOGIN, PLAIN, ANONYMOUS, NTLM, CRAM-MD5, and DIGEST-MD5 (with DES support)." +revision=1 + Add_dependency run glibc -Add_dependency run openssl +Add_dependency run libssl Add_dependency run mit-krb5-libs Add_dependency run e2fsprogs-libs diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index d42df2aede..e0d735dbc1 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -5,6 +5,7 @@ unset run_depends build_depends pkgname=cyrus-sasl +revision=1 configure_args="--with-saslauthd=/var/run/saslauthd --enable-login --enable-plain --enable-sql --disable-sqlite --enable-postgresql --enable-mysql --enable-ldapdb --with-ldap=/usr" @@ -27,7 +28,7 @@ Add_dependency run libldap Add_dependency run mit-krb5-libs Add_dependency run e2fsprogs-libs Add_dependency run pam -Add_dependency run openssl +Add_dependency run libssl Add_dependency run cyrus-sasl-modules Add_dependency build libsasl-devel diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 5df0a4bc49..1aa969ffcb 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,7 @@ # Template build file for 'git". pkgname=git version=1.7.1 +revision=1 distfiles="http://www.kernel.org/pub/software/scm/git/git-$version.tar.bz2" build_style=gnu_configure configure_args="--with-curl --with-expat --without-tcltk" @@ -23,8 +24,9 @@ subpackages="$pkgname-docs $pkgname-perl" Add_dependency run glibc Add_dependency run zlib Add_dependency run expat -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libcurl + Add_dependency build perl Add_dependency build libcurl-devel Add_dependency build zlib-devel diff --git a/srcpkgs/gnome-vfs/template b/srcpkgs/gnome-vfs/template index 942fc97d74..0242f27a53 100644 --- a/srcpkgs/gnome-vfs/template +++ b/srcpkgs/gnome-vfs/template @@ -1,6 +1,7 @@ # Template file for 'gnome-vfs' pkgname=gnome-vfs version=2.24.4 +revision=1 distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--localstatedir=/var --disable-schemas-install @@ -42,9 +43,10 @@ Add_dependency run mit-krb5-libs Add_dependency run e2fsprogs-libs Add_dependency run acl Add_dependency run attr -Add_dependency run openssl +Add_dependency run libssl Add_dependency run gamin Add_dependency run GConf + Add_dependency build pkg-config Add_dependency build intltool Add_dependency build dbus-devel diff --git a/srcpkgs/heimdal/heimdal-libs.template b/srcpkgs/heimdal/heimdal-libs.template index 9c50c80632..1e1209464a 100644 --- a/srcpkgs/heimdal/heimdal-libs.template +++ b/srcpkgs/heimdal/heimdal-libs.template @@ -5,11 +5,11 @@ long_desc="${long_desc} This package contains the shared libraries." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run db -Add_dependency run openssl +Add_dependency run libssl Add_dependency run e2fsprogs-libs ">=1.4.10_1" Add_dependency run readline diff --git a/srcpkgs/heimdal/template b/srcpkgs/heimdal/template index 0e45e7ab36..767802bd88 100644 --- a/srcpkgs/heimdal/template +++ b/srcpkgs/heimdal/template @@ -1,7 +1,7 @@ # Template file for 'heimdal' pkgname=heimdal version=1.3.1 -revision=1 +revision=2 distfiles="http://www.h5l.org/dist/src/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-shared=yes --without-x --datadir=/var/lib/heimdal @@ -20,7 +20,7 @@ conf_files="/etc/krb5.conf" Add_dependency run glibc Add_dependency run db -Add_dependency run openssl +Add_dependency run libssl Add_dependency run readline Add_dependency run e2fsprogs-libs Add_dependency run ncurses-libs diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 33b0d0d7eb..688e1f15df 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,6 +1,7 @@ # Template build file for 'irssi' pkgname=irssi version=0.8.15 +revision=1 distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2" configure_args="--with-proxy --with-perl=module" build_style=gnu_configure @@ -20,8 +21,9 @@ subpackages="irssi-devel irssi-perl" Add_dependency run glibc Add_dependency run zlib Add_dependency run glib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run ncursesw + Add_dependency build perl Add_dependency build pkg-config Add_dependency build zlib-devel diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index d02fff9cbc..e3a4fffd5d 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,14 +1,13 @@ # Template file for 'lftp' pkgname=lftp -version=4.0.5 -revision=1 +version=4.0.10 distfiles="http://ftp.yars.free.net/pub/source/lftp/lftp-$version.tar.bz2" build_style=gnu_configure configure_args="--with-modules --disable-rpath --without-included-regex --with-openssl" short_desc="Sophisticated FTP/HTTP client" maintainer="Juan RP " -checksum=5c1f94f5780ed3cb51fe00439fbfa4e8b4bd28564c3248cb21f6ee9fd794c473 +checksum=445aef690dc7218ea6acbe52350340d792f40cff6e2f806fcbd4203174a25112 long_desc=" LFTP is sophisticated ftp/http client, file transfer program supporting a number of network protocols. Like BASH, it has job control and uses @@ -21,8 +20,9 @@ Add_dependency run libgcc Add_dependency run glibc Add_dependency run ncurses-libs Add_dependency run readline -Add_dependency run openssl +Add_dependency run libssl Add_dependency run expat + Add_dependency build ncurses-devel Add_dependency build readline-devel Add_dependency build openssl-devel diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template index 2ecaccf7c8..d02e14009c 100644 --- a/srcpkgs/libarchive/bsdcpio.template +++ b/srcpkgs/libarchive/bsdcpio.template @@ -26,17 +26,14 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run acl Add_dependency run attr -Add_dependency run openssl +Add_dependency run libssl Add_dependency run expat Add_dependency run liblzma -Add_dependency run bzip2 -Add_dependency run zlib -Add_dependency run libarchive do_install() { diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template index 3a09a249d0..9fd3ca9de9 100644 --- a/srcpkgs/libarchive/bsdtar.template +++ b/srcpkgs/libarchive/bsdtar.template @@ -27,17 +27,14 @@ long_desc=" * GNU tar support. Libarchive reads most GNU tar archives. If there is demand, this can be improved further." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run acl Add_dependency run attr -Add_dependency run openssl +Add_dependency run libssl Add_dependency run expat Add_dependency run liblzma -Add_dependency run bzip2 -Add_dependency run zlib -Add_dependency run libarchive do_install() { diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 713d4d47a5..e557b684ac 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=2.8.4 -revision=1 +revision=2 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--without-xml2" @@ -20,7 +20,7 @@ Add_dependency run bzip2 Add_dependency run zlib Add_dependency run attr Add_dependency run acl -Add_dependency run openssl +Add_dependency run libssl Add_dependency run liblzma Add_dependency run expat diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template index 6ba35b8fa5..8bd56e0a61 100644 --- a/srcpkgs/libldap/template +++ b/srcpkgs/libldap/template @@ -1,6 +1,7 @@ # Template file for 'libldap' pkgname=libldap version=2.4.22 +revision=1 wrksrc="openldap-${version}" distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz" build_style=gnu_configure @@ -19,7 +20,7 @@ subpackages="libldap-devel" Add_dependency run glibc Add_dependency run libsasl -Add_dependency run openssl +Add_dependency run libssl Add_dependency build pkg-config Add_dependency build libsasl-devel Add_dependency build openssl-devel diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 8805d9fece..efd86226be 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,6 +1,7 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.8.1 +revision=1 wrksrc="krb5-${version}" distfiles="http://web.mit.edu/Kerberos/dist/krb5/1.8/krb5-$version-signed.tar" build_style=gnu_configure @@ -24,7 +25,7 @@ conflicts="heimdal>=0" Add_dependency run glibc Add_dependency run db Add_dependency run e2fsprogs-libs -Add_dependency run openssl +Add_dependency run libssl Add_dependency run mit-krb5-libs Add_dependency run mit-krb5-client diff --git a/srcpkgs/mysql/libmysqlclient.template b/srcpkgs/mysql/libmysqlclient.template index aaa82321e1..30aceed197 100644 --- a/srcpkgs/mysql/libmysqlclient.template +++ b/srcpkgs/mysql/libmysqlclient.template @@ -5,9 +5,11 @@ long_desc="${long_desc} This package includes the client library." +revision=1 + Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl do_install() { diff --git a/srcpkgs/mysql/mysql-client.template b/srcpkgs/mysql/mysql-client.template index 25ea1fc1ea..79980e8295 100644 --- a/srcpkgs/mysql/mysql-client.template +++ b/srcpkgs/mysql/mysql-client.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package includes the client binaries and the additional tools innotop and mysqlreport." -revision=1 +revision=2 Add_dependency run libgcc Add_dependency run glibc @@ -16,7 +16,7 @@ Add_dependency run libmysqlclient Add_dependency run zlib Add_dependency run tcp_wrappers-libs Add_dependency run readline -Add_dependency run openssl +Add_dependency run libssl Add_dependency run perl ">=0" do_install() diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index 1c9bb00109..dc575fd12d 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.1.51 -revision=1 +revision=2 distfiles="http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/mysql-${version}.tar.gz" build_style=gnu_configure configure_args="--localstatedir=/var --sysconfdir=/etc/mysql @@ -45,7 +45,7 @@ Add_dependency run libgcc Add_dependency run libstdc++ Add_dependency run zlib Add_dependency run tcp_wrappers-libs -Add_dependency run openssl +Add_dependency run libssl Add_dependency run mysql-client Add_dependency build libstdc++-devel diff --git a/srcpkgs/netpgp/libnetpgp.template b/srcpkgs/netpgp/libnetpgp.template index 65395bfb44..fe3eb35175 100644 --- a/srcpkgs/netpgp/libnetpgp.template +++ b/srcpkgs/netpgp/libnetpgp.template @@ -10,10 +10,12 @@ long_desc=" identifier. netpgp can also encrypt files using the public or private keys of users and, in the same manner, decrypt files which were encrypted." +revision=1 + Add_dependency run glibc Add_dependency run zlib Add_dependency run bzip2 -Add_dependency run openssl +Add_dependency run libssl do_install() { diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index 00edece4f3..f671d6f3d7 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,6 +1,7 @@ # Template file for 'netpgp' pkgname=netpgp version=20100601 +revision=1 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="PGP signing, verification, encryption and decryption program" @@ -32,8 +33,9 @@ subpackages="libnetpgp libnetpgp-devel" Add_dependency run glibc Add_dependency run zlib Add_dependency run bzip2 -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libnetpgp + Add_dependency build zlib-devel Add_dependency build bzip2-devel Add_dependency build openssl-devel diff --git a/srcpkgs/ntp/ntp-perl.template b/srcpkgs/ntp/ntp-perl.template index 0bc7ab3e56..6ba574173d 100644 --- a/srcpkgs/ntp/ntp-perl.template +++ b/srcpkgs/ntp/ntp-perl.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains perl scripts ntp-wait and ntptrace." -revision=1 - Add_dependency run ntp Add_dependency run perl ">=0" diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index c439ab39df..a19d7964ac 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,15 +1,14 @@ # Template file for 'ntp' pkgname=ntp -version=4.2.6p1 -revision=1 +version=4.2.6p2 distfiles="http://archive.ntp.org/ntp4/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-linuxcaps --enable-getifaddrs=glibc - --enable-all-clocks --enable-parse-clocks --with-crypto=openssl - --enable-accurate-adjtime --without-rpath --enable-ipv6" +--enable-all-clocks --enable-parse-clocks --with-crypto=openssl +--enable-accurate-adjtime --without-rpath --enable-ipv6" short_desc="The Network Time Protocol" maintainer="Juan RP " -checksum=ec40f3525e6d66371093705688130c8c8a3d6ab2c90ac6e3dbc1ab455fbc7c5d +checksum=42898b7903a2da04a242885c92919903d56ee69c0293ec828568cab71dd3e9d8 long_desc=" The Network Time Protocol (NTP) is used to synchronize a computer's time with another reference time source. This package includes ntpd @@ -24,7 +23,7 @@ ntpd_homedir="/var/chroot/ntpd" Add_dependency run glibc Add_dependency run readline -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libcap Add_dependency build readline-devel Add_dependency build openssl-devel diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template index b43f82b63e..f255cd7fac 100644 --- a/srcpkgs/openssh/openssh-client.template +++ b/srcpkgs/openssh/openssh-client.template @@ -5,13 +5,13 @@ long_desc="${long_desc} This package contains the ${pkgname} client files." -revision=1 +revision=2 conf_files="/etc/ssh/ssh_config" Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run mit-krb5-libs Add_dependency run openssh ">=${version}" diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template index 24d10d7feb..e807d737ea 100644 --- a/srcpkgs/openssh/openssh-server.template +++ b/srcpkgs/openssh/openssh-server.template @@ -5,13 +5,15 @@ long_desc="${long_desc} This package contains the ${pkgname} server files." +revision=1 + keep_empty_dirs=yes conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" openrc_services="sshd default false" Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run pam Add_dependency run tcp_wrappers-libs Add_dependency run mit-krb5-libs diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index b1885421d4..b7b38d1a08 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh version=5.6p1 -revision=1 +revision=2 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers @@ -32,7 +32,7 @@ subpackages="$pkgname-client $pkgname-server" Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency build tcp_wrappers-devel Add_dependency build zlib-devel diff --git a/srcpkgs/postgresql/postgresql-client.template b/srcpkgs/postgresql/postgresql-client.template index 7777f25af1..2f008a8993 100644 --- a/srcpkgs/postgresql/postgresql-client.template +++ b/srcpkgs/postgresql/postgresql-client.template @@ -12,9 +12,11 @@ long_desc="${long_desc} On a network, you can install this package on many client machines, while the server package may be installed on only one machine." +revision=1 + Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run readline Add_dependency run postgresql-libs diff --git a/srcpkgs/postgresql/postgresql-libs.template b/srcpkgs/postgresql/postgresql-libs.template index 94f5eea586..9432001280 100644 --- a/srcpkgs/postgresql/postgresql-libs.template +++ b/srcpkgs/postgresql/postgresql-libs.template @@ -5,8 +5,10 @@ long_desc="${long_desc} This package provides the shared libraries used by PostgreSQL applications." +revision=1 + Add_dependency run glibc -Add_dependency run openssl +Add_dependency run libssl do_install() { diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 5f956e85b0..fb3fc1db34 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,6 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=8.4.5 +revision=1 distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" build_style=gnu_configure configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python @@ -35,7 +36,7 @@ openrc_services="postgresql default false" Add_dependency run glibc Add_dependency run pam -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libxml2 Add_dependency run postgresql-libs diff --git a/srcpkgs/python/template b/srcpkgs/python/template index fd7ee1d5a4..c5abe27a28 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,7 +1,7 @@ # Template build file for 'python'. pkgname=python version=2.6.5 -revision=2 +revision=3 wrksrc="Python-$version" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2" configure_args="--with-threads --enable-ipv6 --with-signal-module @@ -31,7 +31,7 @@ Add_dependency run zlib Add_dependency run readline Add_dependency run bzip2 Add_dependency run gdbm -Add_dependency run openssl +Add_dependency run libssl Add_dependency run expat Add_dependency run db Add_dependency run ncursesw diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 29e16c38eb..422a3a1394 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,6 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=0.13.0 +revision=1 distfiles="http://download.savannah.gnu.org/releases/qemu/qemu-$version.tar.gz" build_style=configure configure_args="--prefix=/usr --enable-sdl --sysconfdir=/etc @@ -26,13 +27,14 @@ long_desc=" conf_files="/etc/qemu/target-${xbps_machine}.conf" nostrip=yes +disable_parallel_build=yes Add_dependency run glibc Add_dependency run alsa-lib Add_dependency run gnutls Add_dependency run libbluetooth Add_dependency run libidn -Add_dependency run openssl +Add_dependency run libssl Add_dependency run zlib Add_dependency run ncurses-libs Add_dependency run libuuid diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 41a67856d9..ec1072d689 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,6 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.7.0 +revision=1 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz" @@ -43,7 +44,7 @@ Add_dependency run dbus-libs Add_dependency run glib Add_dependency run sqlite Add_dependency run alsa-lib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run tiff Add_dependency run libmng Add_dependency run jpeg diff --git a/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff b/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff new file mode 100644 index 0000000000..6b9346327c --- /dev/null +++ b/srcpkgs/rsyslog/patches/librsyslog_link_to_libz.diff @@ -0,0 +1,14 @@ +librsyslog needs to be linked to libz, because parser.c uses uncompress() +unconditionally and zlib is not linked in. + +--- runtime/Makefile.in.orig 2010-11-02 07:17:30.000000000 +0100 ++++ runtime/Makefile.in 2010-11-02 07:17:54.000000000 +0100 +@@ -482,7 +482,7 @@ librsyslog_la_SOURCES = \ + # runtime or will no longer be needed. -- rgerhards, 2008-06-13 + @WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) + #librsyslog_la_LDFLAGS = -module -avoid-version +-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) ++librsyslog_la_LIBADD = $(ZLIB_LIBS) $(DL_LIBS) $(RT_LIBS) + @ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h + @ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) + @ENABLE_REGEXP_TRUE@lmregexp_la_LDFLAGS = -module -avoid-version diff --git a/srcpkgs/rsyslog/rsyslog-mysql.template b/srcpkgs/rsyslog/rsyslog-mysql.template index 4a6e305c03..d9926c8c64 100644 --- a/srcpkgs/rsyslog/rsyslog-mysql.template +++ b/srcpkgs/rsyslog/rsyslog-mysql.template @@ -5,9 +5,11 @@ long_desc="${long_desc} This package contains the MySQL add-on to store log messages." +revision=1 + Add_dependency run glibc Add_dependency run zlib -Add_dependency run openssl +Add_dependency run libssl Add_dependency run rsyslog Add_dependency run libmysqlclient diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 276c790dd5..78bdc15978 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -4,6 +4,7 @@ ruby_ver="1.9.1" ruby_distpatchver="p376" ruby_distver="${ruby_ver}-${ruby_distpatchver}" version=${ruby_ver}${ruby_distpatchver} +revision=1 wrksrc="${pkgname}-${ruby_distver}" distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${ruby_distver}.tar.gz" build_style=gnu_configure @@ -22,11 +23,12 @@ subpackages="ruby-devel ruby-gems ruby-irb ruby-rdoc ruby-ri" Add_dependency run glibc Add_dependency run db Add_dependency run gdbm -Add_dependency run openssl +Add_dependency run libssl Add_dependency run zlib Add_dependency run readline Add_dependency run ncursesw Add_dependency run ncurses-libs + Add_dependency build db-devel Add_dependency build gdbm-devel Add_dependency build openssl-devel diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index a91958b493..be0fb83d25 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -1,6 +1,7 @@ # Template build file for 'sylpheed'. pkgname=sylpheed version=3.0.3 +revision=1 distfiles="http://sylpheed.sraoss.jp/sylpheed/v3.0/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-compface --disable-gtkspell --disable-gpgme" @@ -37,7 +38,7 @@ Add_dependency run fontconfig Add_dependency run libpng Add_dependency run gdk-pixbuf Add_dependency run gtk+ -Add_dependency run openssl +Add_dependency run libssl Add_dependency build pkg-config Add_dependency build flex diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index e06eb165aa..928faa2956 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,6 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=1.93 +revision=1 distfiles="http://mirrors.m0k.org/$pkgname/files/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-gtk --enable-libnotify --enable-nls --enable-cli @@ -27,7 +28,7 @@ Add_dependency run fontconfig Add_dependency run gtk+ Add_dependency run dbus-glib Add_dependency run dbus-libs -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libcurl Add_dependency run libevent Add_dependency run GConf diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 948bc65604..5617739db4 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.12 -revision=1 +revision=2 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU wget utility" @@ -31,10 +31,12 @@ long_desc=" conf_files="/etc/wgetrc" Add_dependency run glibc -Add_dependency full openssl -Add_dependency full libidn +Add_dependency run libssl +Add_dependency run libidn Add_dependency build gettext Add_dependency build texinfo +Add_dependency build openssl-devel +Add_dependency build libidn-devel post_build() { diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index a7873032a5..b2c00704fb 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=0.7.0 -revision=2 +revision=3 wrksrc=${pkgname}-${version}/${pkgname} distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" build_style=gnu_makefile @@ -28,7 +28,7 @@ openrc_services="$pkgname default false" Add_dependency run glibc Add_dependency run libnl -Add_dependency run openssl +Add_dependency run libssl Add_dependency run dbus-libs Add_dependency run ncurses-libs Add_dependency run readline diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index 90ab1fba17..17ebbf37ef 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -19,7 +19,7 @@ noextract=yes Add_dependency run glibc Add_dependency run zlib Add_dependency run libarchive -Add_dependency run openssl +Add_dependency run libssl Add_dependency build mercurial Add_dependency build zlib-devel Add_dependency build libarchive-devel diff --git a/srcpkgs/xbps/patches/fix_ld_as_needed_order.diff b/srcpkgs/xbps/patches/fix_ld_as_needed_order.diff new file mode 100644 index 0000000000..91bf7879f0 --- /dev/null +++ b/srcpkgs/xbps/patches/fix_ld_as_needed_order.diff @@ -0,0 +1,13 @@ +Fix will be included in 0.6.3. + +--- lib/Makefile.orig 2010-11-02 07:40:41.000000000 +0100 ++++ lib/Makefile 2010-11-02 07:40:54.000000000 +0100 +@@ -66,7 +66,7 @@ $(OBJS): %.o: %.c + + libxbps.so: $(OBJS) $(LIBFETCH_OBJS) $(LIBPROP_OBJS) + @printf " [CCLD]\t\t$@\n" +- @$(CC) $(LDFLAGS) $^ -o $(LIBXBPS_SHLIB) ++ @$(CC) $^ $(LDFLAGS) -o $(LIBXBPS_SHLIB) + @-ln -sf $(LIBXBPS_SHLIB) libxbps.so.$(LIBXBPS_MAJOR) + @-ln -sf $(LIBXBPS_SHLIB) libxbps.so + diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 7a6a3c3386..4520cd682e 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,6 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.6.2 +revision=1 distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz" build_style=configure configure_args="--prefix=/ --includedir=/usr/include @@ -18,7 +19,8 @@ subpackages="$pkgname-static" Add_dependency run glibc Add_dependency run zlib Add_dependency run libarchive -Add_dependency run openssl +Add_dependency run libssl + Add_dependency build pkg-config Add_dependency build zlib-devel Add_dependency build libarchive-devel diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 6e86d4f111..d73a717013 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template build file for 'xorg-server'. pkgname=xorg-server version=1.9.1 -revision=1 +revision=2 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6 @@ -21,7 +21,7 @@ subpackages="$pkgname-devel" Add_dependency run glibc Add_dependency run libudev -Add_dependency run openssl +Add_dependency run libssl Add_dependency run libXext Add_dependency run libX11 Add_dependency run libpciaccess