diff options
39 files changed, 201 insertions, 431 deletions
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD index cddef63f..377fe021 100644 --- a/main/cpufrequtils/APKBUILD +++ b/main/cpufrequtils/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpufrequtils -pkgver=006 +pkgver=007 pkgrel=0 pkgdesc="Userspace tools for the kernel cpufreq subsystem" url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" @@ -9,7 +9,6 @@ subpackages="$pkgname-dev $pkgname-doc" depends="sysfsutils" makedepends="sysfsutils-dev libtool" source="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/$pkgname-$pkgver.tar.bz2 - cpufrequtils-005-build.patch cpufrequtils-006-nls.patch $pkgname.initd $pkgname.confd" @@ -38,8 +37,7 @@ package() { install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="124b0de8f3a4d672539a85ce13eed869 cpufrequtils-006.tar.bz2 -0b007dbd9fcb3acf55a8570f21b2f5d4 cpufrequtils-005-build.patch +md5sums="fdd833ce70a9ae40ae8bce5b18f2becf cpufrequtils-007.tar.bz2 aa4c6f19766a741a68ae1ad352c6bad9 cpufrequtils-006-nls.patch b9b80ef2f1b6c5e7ce0476037a8bce6b cpufrequtils.initd d47ff635eef03248c633486eaeec191d cpufrequtils.confd" diff --git a/main/cpufrequtils/cpufrequtils-005-build.patch b/main/cpufrequtils/cpufrequtils-005-build.patch deleted file mode 100644 index 7dbe5704..00000000 --- a/main/cpufrequtils/cpufrequtils-005-build.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -158,10 +158,10 @@ endif - - # if DEBUG is enabled, then we do not strip or optimize - ifeq ($(strip $(DEBUG)),true) -- CFLAGDEF += -O1 -g -DDEBUG -+ CFLAGDEF += -DDEBUG - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGDEF += $(OPTIMIZATION) -fomit-frame-pointer -+ CFLAGDEF += $(OPTIMIZATION) - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif - -@@ -191,7 +191,7 @@ libcpufreq: libcpufreq.la - - cpufreq-%: libcpufreq.la $(UTIL_OBJS) - $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c -- $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o -+ $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g $(LDFLAGS) -I./lib/ -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq - $(QUIET) $(STRIPCMD) $@ - - utils: cpufreq-info cpufreq-set diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD index 4aceb88b..263b4156 100644 --- a/main/dhcpcd/APKBUILD +++ b/main/dhcpcd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dhcpcd -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="http://roy.marples.name/projects/dhcpcd/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="d18afc66efbea9a28e541e9b10fd284f dhcpcd-5.1.4.tar.bz2" +md5sums="a0b917dfd03b6416386bca06dd219d9b dhcpcd-5.1.5.tar.bz2" diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index b1545f34..feddb67f 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dnsmasq -pkgver=2.51 +pkgver=2.52 pkgrel=0 pkgdesc="Small forwarding DNS server" url="http://www.thekelleys.org.uk/dnsmasq/" @@ -35,6 +35,6 @@ package() { install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf } -md5sums="97465261a6de5258a3c3edfe51ca16a4 dnsmasq-2.51.tar.gz +md5sums="1bb32fffdb4f977ead607802b5d701d0 dnsmasq-2.52.tar.gz db46459322a0c7d9ce4f68251fd265c4 dnsmasq.initd 5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD index 7b6c8032..07648fe9 100644 --- a/main/dosfstools/APKBUILD +++ b/main/dosfstools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dosfstools -pkgver=3.0.8 +pkgver=3.0.9 pkgrel=0 pkgdesc="DOS filesystem utilities" url="http://www.daniel-baumann.ch/software/dosfstools/" @@ -22,4 +22,4 @@ package() { DOCDIR="$pkgdir"/usr/share/doc \ install } -md5sums="48127dc12b200d63fd7b5dbc222dd82d dosfstools-3.0.8.tar.bz2" +md5sums="7f159ec44d3b9c502904bab0236050e4 dosfstools-3.0.9.tar.bz2" diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index c8b04b37..a1aaba4d 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot -pkgver=1.2.9 +pkgver=1.2.10 pkgrel=0 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" @@ -65,5 +65,5 @@ sqlite() { _mv $(cd "$pkgdir" && find usr -name '*sqlite.so') } -md5sums="036ff97fb248dae3bd4b796a0644634f dovecot-1.2.9.tar.gz +md5sums="b7d0081b17ff6afae85e8dc14157fa57 dovecot-1.2.10.tar.gz c58b474dca20e6e60fa4f1f5b9c726e1 dovecot.initd" diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index 911b05f0..139539e1 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="An implementation of Kerberos 5" url="http://www.h5l.org/" license="BSD" @@ -77,7 +77,6 @@ package() { install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd - rm -f "$pkgdir"/usr/bin/compile_et "$pkgdir"/usr/share/man/man1/compile_et.1 # Remove editline, we use libreadline #rm ${pkgdir}/usr/lib/libeditline.* || return 1 #rm ${pkgdir}/usr/include/editline.h || return 1 @@ -96,20 +95,35 @@ package() { fi mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1 done - rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8} + for i in 1 3 5 8; do + rm -rf "$pkgdir"/usr/share/man/cat$i + done # Remove conflicts - rm ${pkgdir}/usr/share/man/man5/ftpusers.5* + # e2fsprogs + rm -f "$pkgdir"/usr/bin/compile_et \ + "$pkgdir"/usr/share/man/man1/compile_et.1 + # man-page + rm "$pkgdir"/usr/share/man/man5/ftpusers.5* + # openssl + rm "$pkgdir"/usr/share/man/man3/DES* + rm "$pkgdir"/usr/share/man/man3/DH* + rm "$pkgdir"/usr/share/man/man3/EVP* + rm "$pkgdir"/usr/share/man/man3/OpenSSL* + rm "$pkgdir"/usr/share/man/man3/RAND* + rm "$pkgdir"/usr/share/man/man3/RSA* + # erlang + rm "$pkgdir"/usr/share/man/man3/os.3* # Compress info pages for page in heimdal hx509; do - gzip -9 ${pkgdir}/usr/share/info/${page}.info + gzip -9 "$pkgdir"/usr/share/info/${page}.info done # Install the license - install -d ${pkgdir}/usr/share/licenses/${pkgname} - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -d "$pkgdir"/usr/share/licenses/$pkgname + install -D -m644 "$srcdir"/$pkgname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/ || return 1 } ftp() { diff --git a/testing/hostapd/APKBUILD b/main/hostapd/APKBUILD index 0c1c8c91..0c1c8c91 100644 --- a/testing/hostapd/APKBUILD +++ b/main/hostapd/APKBUILD diff --git a/testing/hostapd/hostapd.confd b/main/hostapd/hostapd.confd index 60381153..60381153 100644 --- a/testing/hostapd/hostapd.confd +++ b/main/hostapd/hostapd.confd diff --git a/testing/hostapd/hostapd.initd b/main/hostapd/hostapd.initd index cbf962d8..cbf962d8 100644 --- a/testing/hostapd/hostapd.initd +++ b/main/hostapd/hostapd.initd diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD index 27f71e80..2170bd83 100644 --- a/main/libtasn1/APKBUILD +++ b/main/libtasn1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libtasn1 -pkgver=2.2 +pkgver=2.4 pkgrel=0 pkgdesc="The ASN.1 library used in GNUTLS" url="http://www.gnu.org/software/gnutls/" @@ -9,12 +9,17 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="texinfo" install= -source="ftp://ftp.gnu.org/gnu/gnutls/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="14cc361500d2e768a8a6ec538ce3fecb libtasn1-2.2.tar.gz" +md5sums="bdfd59d6eb7924350e91367eb8adaa3c libtasn1-2.4.tar.gz" diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD index 93224d6f..78db7ccf 100644 --- a/main/libx11/APKBUILD +++ b/main/libx11/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libx11 -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=0 pkgdesc="X11 client-side library" url="http://xorg.freedesktop.org/" @@ -28,4 +28,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="001d780829f936e34851ef7cd37b4dfd libX11-1.3.2.tar.bz2" +md5sums="5d74971360f194ce33d2bd2e4d9b066c libX11-1.3.3.tar.bz2" diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index d63cfd68..efb4c4d0 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfcegui4 -pkgver=4.6.2 -pkgrel=1 +pkgver=4.6.3 +pkgrel=0 pkgdesc="Basic GUI functions for Xfce" url="http://www.xfce.org/" license="GPL2" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="e520b93351d87194b5fcc1315acd8617 libxfcegui4-4.6.2.tar.bz2" +md5sums="a647411a0b95d45bb701beff83636307 libxfcegui4-4.6.3.tar.bz2" diff --git a/testing/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD index 56578c40..56578c40 100644 --- a/testing/lua-openrc/APKBUILD +++ b/main/lua-openrc/APKBUILD diff --git a/testing/lua-zlib/APKBUILD b/main/lua-zlib/APKBUILD index 6f319b48..6f319b48 100644 --- a/testing/lua-zlib/APKBUILD +++ b/main/lua-zlib/APKBUILD diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 95f8e5e5..c5e170a6 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.1.42 +pkgver=5.1.43 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -72,6 +72,6 @@ client() { done } -md5sums="b644b219e130b7c6bca81948f75d72d7 mysql-5.1.42.tar.gz +md5sums="451fd3e8c55eecdf4c3ed109dce62f01 mysql-5.1.43.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd 15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index 0196168b..d97acd7a 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=nmap -pkgver=5.20 -pkgrel=1 +pkgver=5.21 +pkgrel=0 pkgdesc="A network exploration tool and security/port scanner" url="http:/nmap.org" license="custom:GPL" @@ -34,12 +34,4 @@ package() { install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -nse() { - pkgdesc="nmap scripting engine" - mkdir -p "$subpkgdir"/usr/share/$pkgname - mv "$pkgdir"/usr/share/$pkgname/nselib \ - "$pkgdir"/usr/share/$pkgname/scripts \ - "$subpkgdir"/usr/share/$pkgname/ -} - -md5sums="ed8567c898c6b8f285fb7bebae449a1c nmap-5.20.tgz" +md5sums="8ce773d70a65007452161e0bde32990c nmap-5.21.tgz" diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index a606b757..5e172137 100644 --- a/main/parted/APKBUILD +++ b/main/parted/APKBUILD @@ -1,27 +1,27 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=parted -pkgver=1.8.8 -pkgrel=1 +pkgver=2.1 +pkgrel=0 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="http://www.gnu.org/software/parted/parted.html" license="GPL3" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev" -source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz - nocxx.patch" - -build () -{ - cd "$srcdir"/$pkgname-$pkgver - patch configure < ../nocxx.patch || return 1 +makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev lvm2-dev" +source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" ./configure --prefix=/usr \ --disable-debug \ --disable-nls \ --disable-Werror make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="0d494591731082ec57cc18627728124a parted-1.8.8.tar.gz -28513788ba4d556ccd538867dc6205ab nocxx.patch" +md5sums="c0fd26f12fefb013d77cc5160722ec03 parted-2.1.tar.gz" diff --git a/main/perl-digest-hmac/APKBUILD b/main/perl-digest-hmac/APKBUILD index f9538dc0..70717b73 100644 --- a/main/perl-digest-hmac/APKBUILD +++ b/main/perl-digest-hmac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-digest-hmac _realname=Digest-HMAC -pkgver=1.01 +pkgver=1.02 pkgrel=0 pkgdesc="Keyed-Hashing for Message Authentication Perl module" url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/" @@ -12,14 +12,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz" +_builddir="$srcdir"/$_realname-$pkgver build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="32dc54c765100c638b5d7f7ff4c5c626 Digest-HMAC-1.01.tar.gz" +md5sums="64c4b247d83cd64ec32aa22bf58a709b Digest-HMAC-1.02.tar.gz" diff --git a/main/perl-error/APKBUILD b/main/perl-error/APKBUILD index f0926e0b..9d04d4ee 100644 --- a/main/perl-error/APKBUILD +++ b/main/perl-error/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-error _realname=Error -pkgver=0.17015 +pkgver=0.17016 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" url="http://search.cpan.org/~shlomif/Error-$pkgver/" @@ -13,14 +13,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz" +_builddir="$srcdir"/$_realname-$pkgver build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="203bc410ae5040e7b647a52aa0fabafe Error-0.17015.tar.gz" +md5sums="eedcd3c6970568dd32092b5334328eff Error-0.17016.tar.gz" diff --git a/main/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD index 83842478..eec71b18 100644 --- a/main/perl-mail-spf/APKBUILD +++ b/main/perl-mail-spf/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-mail-spf _realname=Mail-SPF -pkgver=2.006 -pkgrel=1 +pkgver=2.007 +pkgrel=0 pkgdesc="An object-oriented implementation of Sender Policy Framework" url="http://search.cpan.org/~jmehnle/Mail-SPF-v2.006/" license="GPL PerlArtistic" @@ -13,12 +13,16 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/$_realname-v$pkgver.tar.gz" +_builddir="$srcdir/$_realname-v$pkgver" build() { - cd "$srcdir/$_realname-v$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install } -md5sums="4da41591b612560627ddbc6026b047a3 Mail-SPF-v2.006.tar.gz" +md5sums="67dccdc91e3264679a0e17d493d3cc30 Mail-SPF-v2.007.tar.gz" diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD index a9eef71b..d87821b6 100644 --- a/main/perl-net-dns/APKBUILD +++ b/main/perl-net-dns/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=perl-net-dns _realname=Net-DNS -pkgver=0.65 +pkgver=0.66 pkgrel=0 pkgdesc="Perl interface to the DNS resolver" url="http://search.cpan.org/dist/Archive-Zip/" @@ -13,14 +13,18 @@ install= subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/O/OL/OLAF/$_realname-$pkgver.tar.gz" +_builddir="$srcdir/$_realname-$pkgver" build() { - cd "$srcdir/$_realname-$pkgver" - + cd "$_builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install # creates file collision among perl modules find "$pkgdir" -name perllocal.pod -delete } -md5sums="54e5a12a20de39b954a93723927ac789 Net-DNS-0.65.tar.gz" +md5sums="1635d876324e3c2f6e277d5778bfe94c Net-DNS-0.66.tar.gz" diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD index c50ea10c..a7fcb2e7 100644 --- a/main/ppp/APKBUILD +++ b/main/ppp/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ppp -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=0 pkgdesc="A daemon which implements the PPP protocol for dial-up networking" url="http://www.samba.org/ppp/" license="custom:GPL/BSD" -depends="uclibc libpcap" +depends= makedepends="libpcap-dev" subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz @@ -17,10 +17,15 @@ source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz ip-up ip-down" +_builddir="$srcdir"/$pkgname-$pkgver build () { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr make COPTS="$CFLAGS" || return 1 +} + +package() { + cd "$_builddir" make INSTROOT="$pkgdir" install install -D -m644 "$srcdir"/options "$pkgdir"/etc/ppp/options @@ -34,7 +39,7 @@ build () { install -D -m644 "$srcdir"/pon.1 "$pkgdir"/usr/share/man/man1/pon.1 mkdir -p "$pkgdir"/etc/ppp/peers } -md5sums="183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz +md5sums="4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz 7a9259a8f038073eeea7e4552ff1849f options 48c024f73a80c8b69c4def22f86902cc pon 2d811f8470ccdea3b8c4505a438483e9 poff diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index 33126d3f..8cd7aa0f 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,19 +1,20 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=wireshark -pkgver=1.2.4 +pkgver=1.2.6 pkgrel=0 -pkgdesc="A free network protocol analyzer for Unix/Linux and Windows formerly known as Ethereal" +pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" license="GPLv2" -depends="gnutls bash heimdal" -makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev" +depends="bash" +makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev + gtk+-dev c-ares-dev pcre-dev openssl-dev" install="" -subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2" +subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" +source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2 + wireshark.desktop + wireshark.png" -# append extra dependencies to -dev subpackage -# remove if not used. # depends_dev="somepackage-dev" build() { @@ -23,9 +24,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-wireshark \ - --disable-editcap \ - --disable-mergecap \ + --with-ssl \ --disable-text2pcap \ --disable-idl2wrs \ --disable-dftest \ @@ -35,7 +34,36 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install + install -Dm644 "$srcdir"/wireshark.png \ + "$pkgdir"/usr/share/icons/wireshark.png + install -Dm644 "$srcdir"/wireshark.desktop \ + "$pkgdir"/usr/share/applications/wireshark.desktop } -md5sums="ae4533da7d0e54c236e1eed966c42163 wireshark-1.2.4.tar.bz2" +common() { + local i + pkgdesc="network protoccol analyzer - common files" + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share \ + "$subpkgdir"/usr/bin + mv "$pkgdir"/etc "$subpkgdir"/ + mv "$pkgdir"/usr/share/wireshark "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/ + # move all bins except wireshark + for i in "$pkgdir"/usr/bin/*; do + case "$i" in + */tshark|*/wireshark) continue;; + esac + mv "$i" "$subpkgdir"/usr/bin/ + done +} + +tshark() { + pkgdesc="network protoccol analyzer - console version" + install -d "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark +} + +md5sums="f3e0917ed393366bbf96c53b58cb0931 wireshark-1.2.6.tar.bz2 +504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop +e771800a8c977fe223583a453bc27397 wireshark.png" diff --git a/main/wireshark/wireshark.desktop b/main/wireshark/wireshark.desktop new file mode 100644 index 00000000..f4317f6d --- /dev/null +++ b/main/wireshark/wireshark.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +GenericName=Wireshark +Comment=Network protocol analyzer +Name=wireshark +Exec=wireshark +Icon=/usr/share/icons/wireshark.png +Type=Application +Terminal=false +Categories=Application;Network; diff --git a/main/wireshark/wireshark.png b/main/wireshark/wireshark.png Binary files differnew file mode 100644 index 00000000..4e402630 --- /dev/null +++ b/main/wireshark/wireshark.png diff --git a/testing/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index f9044158..f9044158 100644 --- a/testing/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index 83d31e03..638c4b72 100644 --- a/main/xfsprogs/APKBUILD +++ b/main/xfsprogs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfsprogs -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=0 pkgdesc="XFS filesystem utilities" url="http://oss.sgi.com/projects/xfs/" @@ -9,17 +9,13 @@ depends="e2fsprogs" makedepends="e2fsprogs-dev bash" subpackages="$pkgname-dev $pkgname-doc" source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz - xfsprogs-3.0.0-gzip.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 < $i || return 1 - done + sed -i -e 's/--best//' Makefile doc/Makefile } build() { @@ -40,5 +36,4 @@ package() { cd "$_builddir" make -j1 DIST_ROOT="$pkgdir" install install-dev } -md5sums="07c1ff6a4a44b58ee5ffdabca33a4493 xfsprogs-3.1.0.tar.gz -c72865de30f55343e843dd4fd49a91c5 xfsprogs-3.0.0-gzip.patch" +md5sums="c2308b46ee707597ac50aae418d321b8 xfsprogs-3.1.1.tar.gz" diff --git a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch deleted file mode 100644 index 40f80023..00000000 --- a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru xfsprogs-3.0.0.orig/doc/Makefile xfsprogs-3.0.0/doc/Makefile ---- xfsprogs-3.0.0.orig/doc/Makefile 2009-02-18 13:42:47.000000000 +0000 -+++ xfsprogs-3.0.0/doc/Makefile 2009-02-18 13:43:10.000000000 +0000 -@@ -13,7 +13,7 @@ - include $(BUILDRULES) - - CHANGES.gz: -- $(ZIP) --best -c < CHANGES > $@ -+ $(ZIP) -c < CHANGES > $@ - - install: default - $(INSTALL) -m 755 -d $(PKG_DOC_DIR) -diff -ru xfsprogs-3.0.0.orig/include/buildmacros xfsprogs-3.0.0/include/buildmacros ---- xfsprogs-3.0.0.orig/include/buildmacros 2009-02-18 13:42:47.000000000 +0000 -+++ xfsprogs-3.0.0/include/buildmacros 2009-02-18 13:43:46.000000000 +0000 -@@ -128,7 +128,7 @@ - MAN_MAKERULE = \ - @for f in *.[12345678] ""; do \ - if test ! -z "$$f"; then \ -- $(ZIP) --best -c < $$f > $$f.gz; \ -+ $(ZIP) -c < $$f > $$f.gz; \ - fi; \ - done - diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 4b9796e3..062e456d 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.3.902 +pkgver=1.7.4.901 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" @@ -133,5 +133,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="5806bd9d1ed734a60db2e32473a720b4 xorg-server-1.7.3.902.tar.bz2 +md5sums="e1656bd2fd362299dc7bae489525a9da xorg-server-1.7.4.901.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index b9d1f799..11f1f87e 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,25 +1,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib -pkgver=1.2.3.4 +pkgver=1.2.3.7 pkgrel=1 pkgdesc="A compression/decompression Library" license=custom:zlib url="http://www.gzip.org/zlib" depends= -source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz + gzflush.patch" subpackages="$pkgname-dev $pkgname-doc" +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/gzflush.patch +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr --libdir=/lib --shared make || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make install \ pkgconfigdir="/usr/lib/pkgconfig" \ - LIBS="libz.so.1.2.3.4 libz.a" \ DESTDIR="$pkgdir" || return 1 } @@ -29,4 +35,5 @@ dev() { mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a } -md5sums="70cad33163abe3c234939a5c63bf95ea zlib-1.2.3.4.tar.gz" +md5sums="323e45f54f321116a34950e8fbf5b6e7 zlib-1.2.3.7.tar.gz +36746b916479fcf14b7a4393bee2f2d6 gzflush.patch" diff --git a/main/zlib/gzflush.patch b/main/zlib/gzflush.patch new file mode 100644 index 00000000..5e97e657 --- /dev/null +++ b/main/zlib/gzflush.patch @@ -0,0 +1,12 @@ +--- a/gzwrite.c 2010-01-18 21:18:27.000000000 +0100 ++++ b/gzwrite.c 2010-01-28 04:37:20.330530306 +0100 +@@ -435,7 +435,8 @@ + state = (gz_statep)file; + + /* check that we're writing and that there's no error */ +- if (state->mode != GZ_WRITE|| state->err != Z_OK) ++ if (state->mode != GZ_WRITE || state->err != Z_OK) ++ return Z_STREAM_ERROR; + + /* check flush parameter */ + if (flush < 0 || flush > Z_FINISH) diff --git a/unstable/freeswitch/APKBUILD b/testing/freeswitch/APKBUILD index df048f60..293678c7 100644 --- a/unstable/freeswitch/APKBUILD +++ b/testing/freeswitch/APKBUILD @@ -1,36 +1,23 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=freeswitch -pkgver=1.0.3 -pkgrel=1 +pkgver=1.0.4 +pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" license="GPL" depends="" -makedepends="uclibc++-dev curl-dev unixodbc-dev zlib-dev openssl-dev +makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev autoconf automake libtool" install= subpackages="$pkgname-dev" -source="http://files.freeswitch.org/freeswitch-1.0.3.tar.gz +source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz modules.conf - freeswitch-1.0.3-libtool22-2.patch - freeswitch-1.0.3-parallel-build.patch " build() { cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do - msg "Appling $i..." - patch -p1 < $i || return 1 - done cp -f "$srcdir/modules.conf" modules.conf || return 1 - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - autoheader || return 1 - libtoolize || return 1 - - export CXX=g++-uc # i think our max cmd len is 32768 # by specifying it here we save our selves from some CPU cycles export lt_cv_sys_max_cmd_len=8192 @@ -62,7 +49,5 @@ build() { # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -md5sums="9352e159b6067ce15afe50ba45c40df7 freeswitch-1.0.3.tar.gz -c05f2356be159e99b3845f5260a33599 modules.conf -c9dc93ce5cf13b4bc9ca620131709671 freeswitch-1.0.3-libtool22-2.patch -5bd0c33cbd2a0a0ea4c12c0e1083e3a2 freeswitch-1.0.3-parallel-build.patch" +md5sums="86e34bdd8cc027d71772cb0dc51388da freeswitch-1.0.4.tar.gz +c05f2356be159e99b3845f5260a33599 modules.conf" diff --git a/unstable/freeswitch/freeswitch.initd b/testing/freeswitch/freeswitch.initd index 34f44139..34f44139 100644 --- a/unstable/freeswitch/freeswitch.initd +++ b/testing/freeswitch/freeswitch.initd diff --git a/unstable/freeswitch/freeswitch.install b/testing/freeswitch/freeswitch.install index 0507fe53..0507fe53 100755 --- a/unstable/freeswitch/freeswitch.install +++ b/testing/freeswitch/freeswitch.install diff --git a/unstable/freeswitch/modules.conf b/testing/freeswitch/modules.conf index c6f5a05d..c6f5a05d 100644 --- a/unstable/freeswitch/modules.conf +++ b/testing/freeswitch/modules.conf diff --git a/testing/openvpn/APKBUILD b/testing/openvpn/APKBUILD index 365b6393..bd751f31 100644 --- a/testing/openvpn/APKBUILD +++ b/testing/openvpn/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openvpn -pkgver=2.1_rc19 -pkgrel=1 +pkgver=2.1.1 +pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="http://openvpn.sourceforge.net/" license="custom" @@ -13,9 +13,9 @@ source="http://$pkgname.net/release/$pkgname-$pkgver.tar.gz openvpn.initd " +_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$srcdir"/$pkgname-$pkgver - + cd "$_builddir" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --enable-ssl \ @@ -24,10 +24,13 @@ build() { --enable-iproute2 make || return 1 - cd plugin/down-root make || return 1 cd ../.. +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 @@ -49,7 +52,6 @@ build() { # install init.d install -Dm755 ../openvpn.initd "$pkgdir"/etc/init.d/openvpn - } -md5sums="ba2ee667a8b7606b125b7d32f47ca578 openvpn-2.1_rc19.tar.gz +md5sums="b273ed2b5ec8616fb9834cde8634bce7 openvpn-2.1.1.tar.gz 020376f1e7ed6b4adbe20cf5ff774856 openvpn.initd" diff --git a/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch b/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch deleted file mode 100644 index f36fa45f..00000000 --- a/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch +++ /dev/null @@ -1,240 +0,0 @@ -This is cooked version of: -5. Text File fs-r11674-libtool22-2.patch (14 kB) -http://jira.freeswitch.org/browse/FSBUILD-82 - -Index: libs/apr/build/config.sub -=================================================================== ---- a/libs/apr/build/config.sub (revision 11675) -+++ b/libs/apr/build/config.sub (working copy) -@@ -1,10 +1,9 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - --timestamp='2006-07-02' -+timestamp='2005-12-11' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -241,7 +240,7 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -@@ -249,8 +248,7 @@ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore \ -+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -270,17 +268,16 @@ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ -- | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b \ -+ | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ -@@ -288,6 +285,9 @@ - | z8k) - basic_machine=$basic_machine-unknown - ;; -+ m32c) -+ basic_machine=$basic_machine-unknown -+ ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown -@@ -317,7 +317,7 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* | avr32-* \ -+ | avr-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -328,7 +328,7 @@ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32c-* | m32r-* | m32rle-* \ -+ | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -@@ -350,18 +350,17 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -- | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ -@@ -372,6 +371,8 @@ - | ymp-* \ - | z8k-*) - ;; -+ m32c-*) -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -817,12 +818,6 @@ - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -- pc98) -- basic_machine=i386-pc -- ;; -- pc98-*) -- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -1125,7 +1120,7 @@ - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -+ sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) -@@ -1198,8 +1193,7 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ -@@ -1214,7 +1208,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers*) -+ | -skyos* | -haiku* | -rdos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1366,9 +1360,6 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- spu-*) -- os=-elf -- ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1378,9 +1369,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -Index: build/modmake.rules.in -=================================================================== ---- a/build/modmake.rules.in (revision 11675) -+++ b/build/modmake.rules.in (working copy) -@@ -10,7 +10,7 @@ - INSTALL=@INSTALL@ - GETLIB=@GETLIB@ - LIBTOOL=@LIBTOOL@ --LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL) -+LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) - LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f - CCLD = $(CC) - CXXLD = $(CXX) -@@ -29,7 +29,8 @@ - DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH - LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH - OSARCH=`uname -s` --DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ -+DYNAMIC_LIB_EXTEN = la -+#DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@ - SOLINK = @SOLINK@ - - LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) -@@ -39,11 +40,11 @@ - - COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) - LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) --LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ - - CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE) --CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@ - - CSOURCEFILE=$(MODNAME).c - CXXSOURCEFILE=$(MODNAME).cpp -@@ -107,14 +108,14 @@ - exit 1 ;\ - fi - --$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o -+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo - @echo Creating $@... - @test -d .libs || mkdir .libs - @error="";\ - if test -f $(CSOURCEFILE); then \ -- $(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ -+ $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ - else \ -- $(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ -+ $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\ - fi; - - mod_clean: diff --git a/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch b/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch deleted file mode 100644 index 1e952439..00000000 --- a/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freeswitch-1.0.3/build/modmake.rules.in.orig 2009-03-04 12:58:46.000000000 +0000 -+++ freeswitch-1.0.3/build/modmake.rules.in 2009-03-04 12:59:10.000000000 +0000 -@@ -57,7 +57,7 @@ - RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi ` - RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) ` - RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) ` --RECURSE_MAKE=modname="$(RECURSE_MODNAME)" ; \ -+RECURSE_MAKE=+modname="$(RECURSE_MODNAME)" ; \ - sourcefile="$(RECURSE_SOURCEFILE)" ; \ - osarch=`uname -s` ; \ - ourdefs="$(RECURSE_OUR_DEPS)" ; \ |
