diff options
120 files changed, 3538 insertions, 1243 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 803cb188c..965d9dc94 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,12 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgdesc="Script to build Alpine Packages" pkgname=abuild -pkgver=2.14.3 +pkgver=2.15.0 _ver=${pkgver%_git*} pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper libc-utils" +if [ "$CBUILD" = "$CHOST" ]; then + depends="$depends curl" +fi makedepends="openssl-dev pkgconfig" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="apkbuild-cpan:cpan" @@ -50,6 +53,6 @@ cpan() { mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ } -md5sums="38e58e3c22598913d18e25d532f43316 abuild-2.14.3.tar.xz" -sha256sums="581f71bbf1d3de0e016dcbf130ce36061fa15ef890f5ebddb6c9c4b8aa3ba3a5 abuild-2.14.3.tar.xz" -sha512sums="298cf587b18779d733650df442c91fd0b851c54c00f2ffcb6236eda844dde00310e2da1d4a673ac969b3bcf35387e91fd619ce608c4123067477fa9636699034 abuild-2.14.3.tar.xz" +md5sums="ba2a10bed1efbe31c52de6f64dd9bbf2 abuild-2.15.0.tar.xz" +sha256sums="5518079b8897746d9603cf3692400ec1c6b6af5f57fb003c27edcbd35511dd74 abuild-2.15.0.tar.xz" +sha512sums="d7f2c38f81743e2c8c787d2a9a7c7fa7ec2fbf89c32e72e8a84e66fd517686456e201108388f36250d37804b422ecfacbca4a463172d05359deb9d65e6b20426 abuild-2.15.0.tar.xz" diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD index e7594c01a..c9a781e04 100644 --- a/main/acf-alpine-baselayout/APKBUILD +++ b/main/acf-alpine-baselayout/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout" arch="noarch" license="GPL-2" depends="acf-core lua lua-json4 lua-posix" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD index 9d077bc7d..0221369aa 100644 --- a/main/acf-alpine-conf/APKBUILD +++ b/main/acf-alpine-conf/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-alpine-conf" arch="noarch" license="GPL-2" depends="acf-core lua lua-posix openssl" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD index bf26d564d..114edd229 100644 --- a/main/acf-amavisd-new/APKBUILD +++ b/main/acf-amavisd-new/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua amavisd-new" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD index adc68655c..bb30ee6b7 100644 --- a/main/acf-apk-tools/APKBUILD +++ b/main/acf-apk-tools/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-apk-tools" arch="noarch" license="GPL-2" depends="acf-core lua lua-posix apk-tools" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD index 5a228ecf9..c2c92b6cb 100644 --- a/main/acf-asterisk/APKBUILD +++ b/main/acf-asterisk/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua asterisk" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/acf-asterisk/acf-asterisk-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD index ec3d57db1..8cdfe045b 100644 --- a/main/acf-awall/APKBUILD +++ b/main/acf-awall/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua awall" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD index 1ef4f8070..6b63b7ccf 100644 --- a/main/acf-chrony/APKBUILD +++ b/main/acf-chrony/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-chrony" arch="noarch" license="GPL-2" depends="acf-core lua lua-posix chrony" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD index 9ec6aa3bd..5059b5654 100644 --- a/main/acf-clamav/APKBUILD +++ b/main/acf-clamav/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua clamav" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD index b18526193..2d30d2416 100644 --- a/main/acf-clamsmtp/APKBUILD +++ b/main/acf-clamsmtp/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua clamsmtp" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index e30a98284..60be24e9b 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" license="GPL-2" install="$pkgname.post-upgrade" depends="acf-jquery acf-lib acf-skins haserl lua lua-posix lua-md5 lua-json4 lua-subprocess" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD index 0e6284aa6..40d427659 100644 --- a/main/acf-dansguardian/APKBUILD +++ b/main/acf-dansguardian/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua dansguardian" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD index 8098b6883..4a1db2790 100644 --- a/main/acf-dhcp/APKBUILD +++ b/main/acf-dhcp/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua dhcp" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD index 108f8c670..28e929b7f 100644 --- a/main/acf-dnscache/APKBUILD +++ b/main/acf-dnscache/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-dnscache" arch="noarch" license="GPL-2" depends="acf-core lua lua-posix dnscache" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD index 8779b92cc..e8ebf9fa2 100644 --- a/main/acf-dnsmasq/APKBUILD +++ b/main/acf-dnsmasq/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-dnsmasq" arch="noarch" license="GPL-2" depends="acf-core lua dnsmasq" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD index 4aec258c8..2cdbd4a81 100644 --- a/main/acf-dovecot/APKBUILD +++ b/main/acf-dovecot/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua dovecot" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD index 86375a496..0d9f562d8 100644 --- a/main/acf-fetchmail/APKBUILD +++ b/main/acf-fetchmail/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua fetchmail" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD index 2c7481fe3..4bff16610 100644 --- a/main/acf-freeswitch-vmail/APKBUILD +++ b/main/acf-freeswitch-vmail/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-sqlite3 freeswitch" makedepends="" install="$pkgname.post-upgrade" subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir"/$pkgname-$pkgver diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD index 9ccdb4b01..6a8c3cf87 100644 --- a/main/acf-freeswitch/APKBUILD +++ b/main/acf-freeswitch/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua freeswitch" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD index eaeaa7092..829ac1d92 100644 --- a/main/acf-gross/APKBUILD +++ b/main/acf-gross/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-gross" arch="noarch" license="GPL-2" depends="acf-core lua gross" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD index a883e128f..a99f5de29 100644 --- a/main/acf-heimdal/APKBUILD +++ b/main/acf-heimdal/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua heimdal" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD index b1aad1740..67ffea36c 100644 --- a/main/acf-iproute2-qos/APKBUILD +++ b/main/acf-iproute2-qos/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/$pkgname" arch="noarch" license="GPL-2" depends="acf-core lua iproute2-qos acf-alpine-baselayout>=0.5.7" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD index 253fde6b6..8fd43463d 100644 --- a/main/acf-ipsec-tools/APKBUILD +++ b/main/acf-ipsec-tools/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-ipsec-tools" arch="noarch" license="GPL-2" depends="acf-core lua ipsec-tools" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD index 86dafd3f1..593d002d0 100644 --- a/main/acf-iptables/APKBUILD +++ b/main/acf-iptables/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua iptables" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD index 70b24aed3..3d8b9abbb 100644 --- a/main/acf-jquery/APKBUILD +++ b/main/acf-jquery/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" license="GPL-2" depends="" replaces="acf-core" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD index ee9775ece..dcabc00fa 100644 --- a/main/acf-kamailio/APKBUILD +++ b/main/acf-kamailio/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua kamailio lua-sql-postgres" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD index 3114415c2..2bc42fdad 100644 --- a/main/acf-lib/APKBUILD +++ b/main/acf-lib/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-lib" arch="noarch" license="GPL-2" depends="lua-subprocess" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD index 124cc03e3..c08c9d5c8 100644 --- a/main/acf-lighttpd/APKBUILD +++ b/main/acf-lighttpd/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-lighttpd" arch="noarch" license="GPL-2" depends="acf-core lua lighttpd" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD index 82e12eb07..2569912d6 100644 --- a/main/acf-lvm2/APKBUILD +++ b/main/acf-lvm2/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua lvm2" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD index c7bbdc00a..fab6db4dc 100644 --- a/main/acf-mdadm/APKBUILD +++ b/main/acf-mdadm/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua mdadm" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD index 2f25e24ff..4c3d343a2 100644 --- a/main/acf-opennhrp/APKBUILD +++ b/main/acf-opennhrp/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-opennhrp" arch="noarch" license="GPL-2" depends="acf-core lua lua-posix opennhrp" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD index 4c83ee7b6..5ae724f02 100644 --- a/main/acf-openntpd/APKBUILD +++ b/main/acf-openntpd/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua openntpd" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD index c99beda66..0fcecda12 100644 --- a/main/acf-openssh/APKBUILD +++ b/main/acf-openssh/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-openssh" arch="noarch" license="GPL-2" depends="acf-core lua openssh" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD index e9770e644..d99b1d68b 100644 --- a/main/acf-openssl/APKBUILD +++ b/main/acf-openssl/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua openssl" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD index 1f1b4d993..65d22533a 100644 --- a/main/acf-openvpn/APKBUILD +++ b/main/acf-openvpn/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua openvpn" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD index 8b310b625..c82367b18 100644 --- a/main/acf-pingu/APKBUILD +++ b/main/acf-pingu/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua pingu" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD index d9c438b64..a0f48f6c0 100644 --- a/main/acf-postfix/APKBUILD +++ b/main/acf-postfix/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua postfix" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD index 931d650de..0550e9cf8 100644 --- a/main/acf-postgresql/APKBUILD +++ b/main/acf-postgresql/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua postgresql" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD index dbaba3676..b5af19966 100644 --- a/main/acf-ppp/APKBUILD +++ b/main/acf-ppp/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-ppp" arch="noarch" license="GPL-2" depends="acf-core lua ppp" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD index 82144a60d..fe03e6818 100644 --- a/main/acf-provisioning/APKBUILD +++ b/main/acf-provisioning/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-postgres postgresql-client lua-posixtz" makedepends="" install="" subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir"/$pkgname-$pkgver diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD index 3c0413751..ad48f66ed 100644 --- a/main/acf-quagga/APKBUILD +++ b/main/acf-quagga/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-quagga" arch="noarch" license="GPL-2" depends="acf-core lua quagga" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD index 1ef3f7f3c..e419a9e73 100644 --- a/main/acf-samba/APKBUILD +++ b/main/acf-samba/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua samba" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD index 494debcf1..e1a515d22 100644 --- a/main/acf-shorewall/APKBUILD +++ b/main/acf-shorewall/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-shorewall" arch="noarch" license="GPL-2" depends="acf-core lua shorewall-shell" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD index 8832617b3..294686992 100644 --- a/main/acf-skins/APKBUILD +++ b/main/acf-skins/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-skins" arch="noarch" license="GPL-2" depends="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD index a7ff1820a..2d1208e29 100644 --- a/main/acf-snort/APKBUILD +++ b/main/acf-snort/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua snort" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD index 42ffc6c4e..8a78f9c5f 100644 --- a/main/acf-squid/APKBUILD +++ b/main/acf-squid/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua squid" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD index 2047971e2..9507195f5 100644 --- a/main/acf-tcpproxy/APKBUILD +++ b/main/acf-tcpproxy/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua tcpproxy" makedepends="" install= subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD index 1ec0720dd..560cc1178 100644 --- a/main/acf-tinydns/APKBUILD +++ b/main/acf-tinydns/APKBUILD @@ -8,7 +8,7 @@ url="http://git.alpinelinux.org/cgit/acf-tinydns" arch="noarch" license="GPL-2" depends="acf-core lua tinydns" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/main/acf-vlc-daemon/APKBUILD b/main/acf-vlc-daemon/APKBUILD index 9035f6b7f..8689f9f0a 100644 --- a/main/acf-vlc-daemon/APKBUILD +++ b/main/acf-vlc-daemon/APKBUILD @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev" install="" subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir/$pkgname-$pkgver" prepare() { diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index 644436742..4b32d5e40 100644 --- a/main/acf-weblog/APKBUILD +++ b/main/acf-weblog/APKBUILD @@ -11,7 +11,7 @@ depends="acf-core lua lua-sql-postgres wget postgresql-client lua-subprocess" makedepends="" install="$pkgname.post-upgrade" subpackages="" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2 acf-weblog-update-schema" package() { diff --git a/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch b/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch deleted file mode 100644 index af8b1944e..000000000 --- a/main/alpine-baselayout/0001-mount-media-usb-as-ro-by-default.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0c788d44a3acd686019bd7a276fca014b0aac584 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 17 Dec 2012 15:17:22 +0000 -Subject: [PATCH] mount /media/usb as ro by default - ---- - fstab | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fstab b/fstab -index 83743d1..d1202d5 100644 ---- a/fstab -+++ b/fstab -@@ -1,4 +1,4 @@ - /dev/cdrom /media/cdrom iso9660 noauto,ro 0 0 - /dev/fd0 /media/floppy vfat noauto 0 0 --/dev/usbdisk /media/usb vfat noauto 0 0 -+/dev/usbdisk /media/usb vfat noauto,ro 0 0 - usbfs /proc/bus/usb usbfs noauto 0 0 --- -1.8.0.2 - diff --git a/main/alpine-baselayout/0001-profile-set-LANG-en.utf8.patch b/main/alpine-baselayout/0001-profile-set-LANG-en.utf8.patch deleted file mode 100644 index 45a48aca3..000000000 --- a/main/alpine-baselayout/0001-profile-set-LANG-en.utf8.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9cb5ad198d4ebb1d51441ee81db0bdc63e22bf1c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 17 May 2013 09:18:52 +0000 -Subject: [PATCH] profile: set LANG=en.utf8 - -fixes utf8 in busybox ---- - profile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/profile b/profile -index bb99d29..5144f7d 100644 ---- a/profile -+++ b/profile -@@ -1,4 +1,5 @@ - export CHARSET=UTF-8 -+export LANG=en.utf8 - export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - export PAGER=less - export PS1='\h:\w\$ ' --- -1.8.2.3 - diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index 08cddf3d4..00e226540 100644 --- a/main/alpine-baselayout/APKBUILD +++ b/main/alpine-baselayout/APKBUILD @@ -1,50 +1,199 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout -pkgver=2.2.0 -pkgrel=6 +pkgver=2.3.0 +pkgrel=1 pkgdesc="Alpine base dir structure and init scripts" -url=http://git.alpinelinux.org/cgit/alpine-baselayout +url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" depends= options="!fhs" -install="$pkgname.pre-upgrade $pkgname.post-upgrade" -source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-mount-media-usb-as-ro-by-default.patch - 0001-profile-set-LANG-en.utf8.patch +install="$pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.post-install" +source="mkmntdirs.c + crontab + color_prompt + + aliases.conf + blacklist.conf + i386.conf + kms.conf + + group + inittab + passwd + profile + protocols + services " arch="all" license=GPL-2 -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/build prepare() { - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + mkdir -p "$_builddir" } build() { cd "$_builddir" - rm -f src/mkmntdirs - make + ${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $LDFLAGS \ + "$srcdir"/mkmntdirs.c -o "$_builddir"/mkmntdirs + + # generate shadow + awk -F: '{ + pw = ":!:" + if ($1 == "root") { pw = "::" } + print($1 pw ":0:::::") + }' "$srcdir"/passwd > shadow + } package() { - cd "$_builddir" - make install PREFIX= DESTDIR="$pkgdir" || return 1 - rm -rf "$pkgdir"/etc/issue "$pkgdir"/usr/share/udhcpc \ - "$pkgdir"/etc/init.d/vlan - - # lets blacklist microcode - echo "blacklist microcode" > "$pkgdir"/etc/modprobe.d/microcode.conf + mkdir -p "$pkgdir" + cd "$pkgdir" + install -m 0755 -d \ + dev \ + dev/pts \ + dev/shm \ + etc \ + etc/apk \ + etc/conf.d \ + etc/crontabs \ + etc/init.d \ + etc/modprobe.d \ + etc/profile.d \ + etc/network/if-down.d \ + etc/network/if-post-down.d \ + etc/network/if-pre-up.d \ + etc/network/if-up.d \ + etc/periodic/15min \ + etc/periodic/daily \ + etc/periodic/hourly \ + etc/periodic/monthly \ + etc/periodic/weekly \ + home \ + lib/firmware \ + lib/mdev \ + media/cdrom \ + media/floppy \ + media/usb \ + mnt \ + proc \ + sbin \ + sys \ + usr/bin \ + usr/sbin \ + usr/local/bin \ + usr/local/lib \ + usr/local/share \ + usr/share \ + var/cache/misc \ + var/lib/misc \ + var/lock/subsys \ + var/log \ + var/run \ + var/spool/cron \ + run \ + || return 1 + + install -d -m 0700 "$pkgdir"/root || return 1 + install -d -m 1777 "$pkgdir"/tmp "$pkgdir"/var/tmp || return 1 + install -m755 "$_builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs \ + || return 1 + + install -m644 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root || return 1 + install -m644 "$srcdir"/color_prompt "$pkgdir"/etc/profile.d/ \ + || return 1 + install -m644 \ + "$srcdir"/aliases.conf \ + "$srcdir"/blacklist.conf \ + "$srcdir"/i386.conf \ + "$srcdir"/kms.conf \ + "$pkgdir"/etc/modprobe.d/ || return 1 + + echo "UTC" > "$pkgdir"/etc/TZ + echo "localhost" > "$pkgdir"/etc/hostname + echo "127.0.0.1 localhost localhost.localdomain" > "$pkgdir"/etc/hosts + echo "af_packet" >"$pkgdir"/etc/modules + + cat > "$pkgdir"/etc/shells <<EOF +# valid login shells +/bin/sh +/bin/ash +EOF + + cat > "$pkgdir"/etc/motd <<EOF +Welcome to Alpine! + +The Alpine Wiki contains a large amount of how-to guides and general +information about administrating Alpine systems. +See <http://wiki.alpinelinux.org>. + +You may change this message by editing /etc/motd. + +EOF + cat > "$pkgdir"/etc/sysctl.conf <<EOF +net.ipv4.ip_forward = 0 +net.ipv4.tcp_syncookies = 1 +net.ipv4.conf.default.rp_filter = 1 +net.ipv4.conf.all.rp_filter = 1 +kernel.panic = 120 +EOF + cat > "$pkgdir"/etc/fstab <<EOF +/dev/cdrom /media/cdrom iso9660 noauto,ro 0 0 +/dev/usbdisk /media/usb vfat noauto,ro 0 0 +EOF + + install -m644 \ + "$srcdir"/group \ + "$srcdir"/passwd \ + "$srcdir"/inittab \ + "$srcdir"/profile \ + "$srcdir"/protocols \ + "$srcdir"/services \ + "$pkgdir"/etc/ || return 1 + + install -m600 "$_builddir"/shadow \ + "$pkgdir"/etc/ || return 1 + + # symlinks + ln -s /etc/crontabs "$pkgdir"/var/spool/cron/crontabs + ln -s /proc/mounts "$pkgdir"/etc/mtab + } -md5sums="225dbf5b50ae6d3d188ff92c5746bc36 alpine-baselayout-2.2.0.tar.bz2 -0619f806d91a5293a95debe9fb0124b5 0001-mount-media-usb-as-ro-by-default.patch -d53f5b40ed84866fde4a14906ff6658c 0001-profile-set-LANG-en.utf8.patch" -sha256sums="aaa124e12c70c63772f374b0e041a5a1e8db2776cedc453bd04626edfacd22aa alpine-baselayout-2.2.0.tar.bz2 -da88b6415da532aa89bbfadcb671d8dbba65ceb232ee49aee179062c15320574 0001-mount-media-usb-as-ro-by-default.patch -b94791e6ec326816859c20d60543c30e360a7ba27c8ea45440fab5b0091cd830 0001-profile-set-LANG-en.utf8.patch" -sha512sums="9a327c15b779d794623c8e4cecc82f0a014d15a8ffeb1de6eadf8ccde1e65593d2d14665bd95c6d9da4e15fe9db2f8342af7bdf834af7378007f8eaecbb7d6b4 alpine-baselayout-2.2.0.tar.bz2 -41c4d671d3263d1b08a04021a2da7aec867807ba05afb3926eb6953a609fbf6e0728bf8f75a08853a2258a763beb6845f80d7ee97256cfa1792e6cf57557615e 0001-mount-media-usb-as-ro-by-default.patch -d09330579eaabf698b05ea36b13bd21dba2d7ff969fb11ab7549b6ed2e2e331525aa171d5f4a7e9bf4cd5b7883d004d8c23bdc0da8c59b0993a0bb69ec497014 0001-profile-set-LANG-en.utf8.patch" +md5sums="686863b10c1cfdf07322ea0ecc977da5 mkmntdirs.c +6e67923e98287d5133b565acd44cb506 crontab +a658b219ac3dd3199ef4092f6be3c9da color_prompt +6945faabb2a18cee73c0a6d78b499084 aliases.conf +0ea6be55b18804f166e6939e9d5f4099 blacklist.conf +f9e3eac60200d41dd5569eeabb4eddff i386.conf +17ba4f49c51dd2ba49ccceb0ecadaca4 kms.conf +f376b41c65d720e51d3cd54147797911 group +d93ca19f6867a1a3918fa782d9b7c512 inittab +d05579984e737021401d8c40153c5b5d passwd +dcb55fbc491316cdb3874f3ddae8f566 profile +394f8cd9fbf549f1d1b9a5bba680fc92 protocols +5278bea4f45f4e289f72897b84dcb909 services" +sha256sums="9c5f25b07bfc28fff4232b5fd64fce45dd10ddd0f4a59741f2ca74ff99e4db3e mkmntdirs.c +575d810a9fae5f2f0671c9b2c0ce973e46c7207fbe5cb8d1b0d1836a6a0470e3 crontab +79698d2a91fa608954122b7e39eca67bf1e8aaba93ad216f70ef88c903e417b9 color_prompt +3e2daa0326fc4d73921cd693dff47b211d0ba3d92ad62fca072c259600695693 aliases.conf +70becab743ff2071247bd144499eadbb1b42a5436dcc63991d69aa63ee2fe755 blacklist.conf +6c46c4cbfb8b7594f19eb94801a350fa2221ae9ac5239a8819d15555caa76ae8 i386.conf +079f74b93a4df310f55f60fea5e05996d3267c50076ae16402fa9e497ea5fdb2 kms.conf +c1645874cff5c378fc67c15f690a6bc46b14c833449de4a2b2e38d2e18b7defd group +8a54b20451ba9469b5260f76faa90fbde96915bf33e7f03f88bdbaf813400485 inittab +348e451c8d4d2d9807d78114d100942f1c5481fd52550c821922b84a16f02d42 passwd +8165abfa26a1754c317228e78142f4a89dd72a669951d269f0b68d7a92faf1e8 profile +a6695dbd53b87c7b41dfdafd40b1c8ba34fed2f0fa8eaaa296ad17c0b154603e protocols +e96af627f7774e8c87b0de843556a355fea6150c4d64fa4e2ff2c5fd610e7a79 services" +sha512sums="670fce7a9d5c492289b7dca06077a5109672fbec2accf21bfb3531651f0434939ff07e71c61949df2c0bfe3c2f178a503f0086867b84e3874abd5c90233149b7 mkmntdirs.c +6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82 crontab +9ca0da660eec586efba538410de04d3d76e99c069fadf0811bfb0a5da0bb8432b8ea5fbb8e530b7f71eb97b68dbe84dbbf67763252069433ce8c56a738d434a6 color_prompt +8d55acb0457eec4008ba09c3de92fed6893b72d062edd5dcd74016e9c6c4dfeba7e86620e59d21a7adce11377ec793812c90e9d9771a804097fa64cff646666c aliases.conf +2b8e55339955c9670b5b9832bf57e711aca70cd2ebf815a9623fbb7fcd440cca4dd6a4862750885f779080d5c5416de197ff9a250cf116b1c8cf130fafbdaae8 blacklist.conf +49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95 i386.conf +b407351a5a64b00100753a13a91f4b1cb51017ae918a91fd37f3a6e76e3b6f562be643e74f969a888bdd54b0ad2d09e3b283d44ae4b5efccca7d7e9f735c5afb kms.conf +2ebccd4b5ab7292f7ea562e35283e5d31d38721ae47f5947934ba056d3d94dac43c2a3d85df395778de035dc995e74833383d152ade8a8042d397d6af3e161be group +bdb6fe1f3e07466d9badf9a18b1f3fc9585f0a4cb69c00f1fa6d8b1e9903a3c497edefbfd345e324961013999e5692d2ed68ae7defaf1c6e57cc7916f206fd75 inittab +3b9be283e171516dd45ee29775a1149ba20d5672bef422a698ed944ce66697e5a80dec21a9a20c079cca895890dbfa73ccbb8000a55504d95ced4e7436d8e16b passwd +9e197ec99c97ec2b03b97546d632a865d6e7abe5742ac48bcb458a505ce38abd1010ef93ea8a752251578ea993708324e1d36ccf77ee3e7cde7e8db98cc42d67 profile +f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols +cecfc06b1f455d65b0c54a5651e601298b455771333e39d0109eeffd7ebd8d81b7738738eb647e6d3076230b6f3707782b83662ea3764ec33dc5e0b3453d3965 services" diff --git a/main/alpine-baselayout/aliases.conf b/main/alpine-baselayout/aliases.conf new file mode 100644 index 000000000..9b1796fc2 --- /dev/null +++ b/main/alpine-baselayout/aliases.conf @@ -0,0 +1,57 @@ +# Aliases to tell insmod/modprobe which modules to use + +# Uncomment the network protocols you don't want loaded: +# alias net-pf-1 off # Unix +# alias net-pf-2 off # IPv4 +# alias net-pf-3 off # Amateur Radio AX.25 +# alias net-pf-4 off # IPX +# alias net-pf-5 off # DDP / appletalk +# alias net-pf-6 off # Amateur Radio NET/ROM +# alias net-pf-9 off # X.25 +# alias net-pf-10 off # IPv6 +# alias net-pf-11 off # ROSE / Amateur Radio X.25 PLP +# alias net-pf-19 off # Acorn Econet + +alias char-major-10-175 agpgart +alias char-major-10-200 tun +alias char-major-81 bttv +alias char-major-108 ppp_generic +alias /dev/ppp ppp_generic +alias tty-ldisc-3 ppp_async +alias tty-ldisc-14 ppp_synctty +alias ppp-compress-21 bsd_comp +alias ppp-compress-24 ppp_deflate +alias ppp-compress-26 ppp_deflate + +# Crypto modules (see http://www.kerneli.org/) +alias loop-xfer-gen-0 loop_gen +alias loop-xfer-3 loop_fish2 +alias loop-xfer-gen-10 loop_gen +alias cipher-2 des +alias cipher-3 fish2 +alias cipher-4 blowfish +alias cipher-6 idea +alias cipher-7 serp6f +alias cipher-8 mars6 +alias cipher-11 rc62 +alias cipher-15 dfc2 +alias cipher-16 rijndael +alias cipher-17 rc5 + +# Support for i2c and lm_sensors +alias char-major-89 i2c-dev + +# xfrm +alias xfrm-type-2-4 xfrm4_tunnel +alias xfrm-type-2-50 esp4 +alias xfrm-type-2-51 ah4 +alias xfrm-type-2-108 ipcomp +alias xfrm-type-10-41 xfrm6_tunnel +alias xfrm-type-10-50 esp6 +alias xfrm-type-10-51 ah6 +alias xfrm-type-10-108 ipcomp6 + +alias sha1 sha1-generic +# change to aes-i586 to boost performance +alias aes aes-generic + diff --git a/main/alpine-baselayout/alpine-baselayout.post-install b/main/alpine-baselayout/alpine-baselayout.post-install new file mode 100644 index 000000000..79050e5ca --- /dev/null +++ b/main/alpine-baselayout/alpine-baselayout.post-install @@ -0,0 +1,39 @@ +#!/bin/sh + +create_vserver_startstop() { + cat <<__EOF__ +#!/bin/sh + +# This file is for compatibility +case \${0##*/} in +rcL) + RUNLEVEL=1 /sbin/rc sysinit || exit 1 + /sbin/rc boot || exit 1 + /sbin/rc \${1:-default} + exit 0 + ;; +rcK) + /sbin/rc shutdown + ;; +esac + +__EOF__ +} + +# create compat start/stop scripts for vserver guests +if [ "$( /sbin/rc --sys )" = "VSERVER" ]; then + # create rcL and rcK + if ! [ -e /etc/init.d/rcL ]; then + create_vserver_startstop > /etc/init.d/rcL + chmod +x /etc/init.d/rcL + fi + if ! [ -e /etc/init.d/rcK ]; then + ln -s rcL /etc/init.d/rcK + fi +fi + +# force /etc/shadow to be owned by root and not be world readable +chown root:root /etc/shadow +chmod o-rwx /etc/shadow + +exit 0 diff --git a/main/alpine-baselayout/alpine-baselayout.post-upgrade b/main/alpine-baselayout/alpine-baselayout.post-upgrade index 8edfb73d7..0e73fc07f 100644..120000 --- a/main/alpine-baselayout/alpine-baselayout.post-upgrade +++ b/main/alpine-baselayout/alpine-baselayout.post-upgrade @@ -1,35 +1 @@ -#!/bin/sh - -create_vserver_startstop() { - cat <<__EOF__ -#!/bin/sh - -# This file is for compatibility -case \${0##*/} in -rcL) - RUNLEVEL=1 /sbin/rc sysinit || exit 1 - /sbin/rc boot || exit 1 - /sbin/rc \${1:-default} - exit 0 - ;; -rcK) - /sbin/rc shutdown - ;; -esac - -__EOF__ -} - -# create compat start/stop scripts for vserver guests -if [ "$(/sbin/rc --sys)" = "VSERVER" ]; then - # create rcL and rcK - if ! [ -e /etc/init.d/rcL ]; then - create_vserver_startstop > /etc/init.d/rcL - chmod +x /etc/init.d/rcL - fi - if ! [ -e /etc/init.d/rcK ]; then - ln -s rcL /etc/init.d/rcK - fi -fi - -exit 0 +alpine-baselayout.post-install
\ No newline at end of file diff --git a/main/alpine-baselayout/blacklist.conf b/main/alpine-baselayout/blacklist.conf new file mode 100644 index 000000000..cf19a4e28 --- /dev/null +++ b/main/alpine-baselayout/blacklist.conf @@ -0,0 +1,79 @@ +# +# Listing a module here prevents the hotplug scripts from loading it. +# Usually that'd be so that some other driver will bind it instead, +# no matter which driver happens to get probed first. Sometimes user +# mode tools can also control driver binding. + +# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +blacklist de4x5 + +# At least 2.4.3 and later xircom_tulip doesn't have that conflict +# xircom_tulip_cb +blacklist dmfe + +#evbug is a debug tool and should be loaded explicitly +blacklist evbug + +# Alternate 8139 driver. Some 8139 cards need this specific driver, +# though... +# blacklist 8139cp + +# Ethernet over IEEE1394 module. In too many cases this will load +# when there's no eth1394 device present (just an IEEE1394 port) +blacklist eth1394 + +# This module causes many Intel motherboards to crash and reboot. +blacklist i8xx-tco + +# The kernel lists this as "experimental", but for now it's "broken" +blacklist via-ircc + +# ALSA modules to support sound modems. These should be loaded manually +# if needed. For most people they just break sound support... +blacklist snd-atiixp-modem +blacklist snd-intel8x0m +blacklist snd-via82xx-modem + +# we don't want use the pc speaker +blacklist snd-pcsp + +# Alternative module to Orinoco Wireless Cards. +blacklist hostap +blacklist hostap_cs + +# framebuffer drivers +blacklist aty128fb +blacklist atyfb +blacklist radeonfb +blacklist i810fb +blacklist cirrusfb +blacklist intelfb +blacklist kyrofb +blacklist i2c-matroxfb +blacklist hgafb +blacklist nvidiafb +blacklist rivafb +blacklist savagefb +blacklist sstfb +blacklist neofb +blacklist tridentfb +blacklist tdfxfb +blacklist viafb +blacklist virgefb +blacklist vga16fb +blacklist matroxfb_base + +# blacklist 1394 drivers +blacklist ohci1394 +blacklist video1394 +blacklist dv1394 + +# blacklist mISDN dirver by default as we prefer dahdi drivers +blacklist hfcmulti +blacklist hfcpci +blacklist hfcsusb + +# blacklist C7 cpu freq. use acpi-cpufreq instead +blacklist e_powersaver + +blacklist microcode diff --git a/main/alpine-baselayout/color_prompt b/main/alpine-baselayout/color_prompt new file mode 100644 index 000000000..00a4dcfa9 --- /dev/null +++ b/main/alpine-baselayout/color_prompt @@ -0,0 +1,9 @@ +# Setup a red prompt for root and a green one for users. +NORMAL="\[\e[0m\]" +RED="\[\e[1;31m\]" +GREEN="\[\e[1;32m\]" +if [ "$USER" = root ]; then + PS1="$RED\h [$NORMAL\w$RED]# $NORMAL" +else + PS1="$GREEN\h [$NORMAL\w$GREEN]\$ $NORMAL" +fi diff --git a/main/alpine-baselayout/crontab b/main/alpine-baselayout/crontab new file mode 100644 index 000000000..fd8acd8b9 --- /dev/null +++ b/main/alpine-baselayout/crontab @@ -0,0 +1,8 @@ +# do daily/weekly/monthly maintenance +# min hour day month weekday command +*/15 * * * * run-parts /etc/periodic/15min +0 * * * * run-parts /etc/periodic/hourly +0 2 * * * run-parts /etc/periodic/daily +0 3 * * 6 run-parts /etc/periodic/weekly +0 5 1 * * run-parts /etc/periodic/monthly + diff --git a/main/alpine-baselayout/group b/main/alpine-baselayout/group new file mode 100644 index 000000000..5a6cbccf2 --- /dev/null +++ b/main/alpine-baselayout/group @@ -0,0 +1,54 @@ +root:x:0:root +bin:x:1:root,bin,daemon +daemon:x:2:root,bin,daemon +sys:x:3:root,bin,adm +adm:x:4:root,adm,daemon +tty:x:5: +disk:x:6:root,adm +lp:x:7:lp +mem:x:8: +kmem:x:9: +wheel:x:10:root +floppy:x:11:root +mail:x:12:mail +news:x:13:news +uucp:x:14:uucp +man:x:15:man +cron:x:16:cron +console:x:17: +audio:x:18: +cdrom:x:19: +dialout:x:20:root +ftp:x:21: +sshd:x:22: +at:x:25:at +tape:x:26:root +video:x:27:root +netdev:x:28: +readproc:x:30: +squid:x:31:squid +gdm:x:32:gdm +xfs:x:33:xfs +kvm:x:34:kvm +games:x:35: +named:x:40:named +mysql:x:60: +postgres:x:70: +cdrw:x:80: +apache:x:81: +nut:x:84: +usb:x:85: +avahi:x:86: +vpopmail:x:89: +users:x:100:games +ntp:x:123: +nofiles:x:200: +postfix:x:207: +postdrop:x:208: +smmsp:x:209:smmsp +distcc:x:240: +slocate:x:245: +abuild:x:300: +utmp:x:406: +nogroup:x:65533: +nobody:x:65534: diff --git a/main/alpine-baselayout/i386.conf b/main/alpine-baselayout/i386.conf new file mode 100644 index 000000000..b89459f1e --- /dev/null +++ b/main/alpine-baselayout/i386.conf @@ -0,0 +1,4 @@ +alias parport_lowlevel parport_pc +alias char-major-10-144 nvram +alias binfmt-0064 binfmt_aout +alias char-major-10-135 rtc diff --git a/main/alpine-baselayout/inittab b/main/alpine-baselayout/inittab new file mode 100644 index 000000000..00c467d00 --- /dev/null +++ b/main/alpine-baselayout/inittab @@ -0,0 +1,22 @@ +# /etc/inittab + +::sysinit:/sbin/rc sysinit +::wait:/sbin/rc default + +# Set up a couple of getty's +tty1::respawn:/sbin/getty 38400 tty1 +tty2::respawn:/sbin/getty 38400 tty2 +tty3::respawn:/sbin/getty 38400 tty3 +tty4::respawn:/sbin/getty 38400 tty4 +tty5::respawn:/sbin/getty 38400 tty5 +tty6::respawn:/sbin/getty 38400 tty6 + +# Put a getty on the serial port +#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 + +# Stuff to do for the 3-finger salute +::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/sbin/rc shutdown + diff --git a/main/alpine-baselayout/kms.conf b/main/alpine-baselayout/kms.conf new file mode 100644 index 000000000..59d56fbcd --- /dev/null +++ b/main/alpine-baselayout/kms.conf @@ -0,0 +1,3 @@ +# enable modeset +options radeon modeset=1 +options i915 modeset=1 diff --git a/main/alpine-baselayout/mkmntdirs.c b/main/alpine-baselayout/mkmntdirs.c new file mode 100644 index 000000000..6e3a3ef21 --- /dev/null +++ b/main/alpine-baselayout/mkmntdirs.c @@ -0,0 +1,66 @@ +/* + * Create mount directories in fstab + * + * Copyright(c) 2008 Natanael Copa <natanael.copa@gmail.com> + * May be distributed under the terms of GPL-2 + * + * usage: mkmntdirs [fstab] + * + */ + +#include <sys/stat.h> +#include <sys/types.h> + +#include <err.h> +#include <mntent.h> +#include <stdio.h> + + +#ifdef DEBUG +#define mkdir_recursive(p) puts((p)) +#else +static void mkdir_recursive(char *path) +{ + char *s = path; + while (1) { + int c = '\0'; + while (*s) { + if (*s == '/') { + do { + ++s; + } while (*s == '/'); + c = *s; /* Save the current char */ + *s = '\0'; /* and replace it with nul. */ + break; + } + ++s; + } + mkdir(path, 0755); + if (c == '\0') + return; + *s = c; + } +} +#endif + +int main(int argc, const char *argv[]) +{ + const char *filename = "/etc/fstab"; + FILE *f; + struct mntent *ent; + if (argc == 2) + filename = argv[1]; + + f = setmntent(filename, "r"); + if (f == NULL) + err(1, "%s", filename); + + while ((ent = getmntent(f)) != NULL) { + if (strcmp(ent->mnt_dir, "none") != 0) + mkdir_recursive(ent->mnt_dir); + } + + endmntent(f); + return 0; +} + diff --git a/main/alpine-baselayout/passwd b/main/alpine-baselayout/passwd new file mode 100644 index 000000000..e47354106 --- /dev/null +++ b/main/alpine-baselayout/passwd @@ -0,0 +1,35 @@ +root:x:0:0:root:/root:/bin/ash +bin:x:1:1:bin:/bin:/sbin/nologin +daemon:x:2:2:daemon:/sbin:/sbin/nologin +adm:x:3:4:adm:/var/adm:/sbin/nologin +lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin +sync:x:5:0:sync:/sbin:/bin/sync +shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown +halt:x:7:0:halt:/sbin:/sbin/halt +mail:x:8:12:mail:/var/spool/mail:/sbin/nologin +news:x:9:13:news:/usr/lib/news:/sbin/nologin +uucp:x:10:14:uucp:/var/spool/uucppublic:/sbin/nologin +operator:x:11:0:operator:/root:/bin/sh +man:x:13:15:man:/usr/man:/sbin/nologin +postmaster:x:14:12:postmaster:/var/spool/mail:/sbin/nologin +cron:x:16:16:cron:/var/spool/cron:/sbin/nologin +ftp:x:21:21::/var/lib/ftp:/sbin/nologin +sshd:x:22:22:sshd:/dev/null:/sbin/nologin +at:x:25:25:at:/var/spool/cron/atjobs:/sbin/nologin +squid:x:31:31:Squid:/var/cache/squid:/sbin/nologin +gdm:x:32:32:GDM:/var/lib/gdm:/sbin/nologin +xfs:x:33:33:X Font Server:/etc/X11/fs:/sbin/nologin +games:x:35:35:games:/usr/games:/sbin/nologin +named:x:40:40:bind:/var/bind:/sbin/nologin +mysql:x:60:60:mysql:/var/lib/mysql:/sbin/nologin +postgres:x:70:70::/var/lib/postgresql:/bin/sh +apache:x:81:81:apache:/var/www:/sbin/nologin +nut:x:84:84:nut:/var/state/nut:/sbin/nologin +cyrus:x:85:12::/usr/cyrus:/sbin/nologin +vpopmail:x:89:89::/var/vpopmail:/sbin/nologin +ntp:x:123:123:NTP:/var/empty:/sbin/nologin +postfix:x:207:207:postfix:/var/spool/postfix:/sbin/nologin +smmsp:x:209:209:smmsp:/var/spool/mqueue:/sbin/nologin +distcc:x:240:2:distccd:/dev/null:/sbin/nologin +guest:x:405:100:guest:/dev/null:/sbin/nologin +nobody:x:65534:65534:nobody:/:/sbin/nologin diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile new file mode 100644 index 000000000..5144f7d9a --- /dev/null +++ b/main/alpine-baselayout/profile @@ -0,0 +1,12 @@ +export CHARSET=UTF-8 +export LANG=en.utf8 +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +export PAGER=less +export PS1='\h:\w\$ ' +umask 022 + +for script in /etc/profile.d/*.sh ; do + if [ -r $script ] ; then + . $script + fi +done diff --git a/main/alpine-baselayout/protocols b/main/alpine-baselayout/protocols new file mode 100644 index 000000000..03f049d06 --- /dev/null +++ b/main/alpine-baselayout/protocols @@ -0,0 +1,45 @@ +# /etc/protocols: +# $Id: protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $ +# $Header: /home/cvsroot/gentoo-projects/embedded/baselayout-lite/protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $ +# +# Internet (IP) protocols +# +# from: @(#)protocols 5.1 (Berkeley) 4/17/89 +# +# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992). + +ip 0 IP # internet protocol, pseudo protocol number +icmp 1 ICMP # internet control message protocol +igmp 2 IGMP # Internet Group Management +ggp 3 GGP # gateway-gateway protocol +ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') +st 5 ST # ST datagram mode +tcp 6 TCP # transmission control protocol +egp 8 EGP # exterior gateway protocol +pup 12 PUP # PARC universal packet protocol +udp 17 UDP # user datagram protocol +hmp 20 HMP # host monitoring protocol +xns-idp 22 XNS-IDP # Xerox NS IDP +rdp 27 RDP # "reliable datagram" protocol +iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4 +xtp 36 XTP # Xpress Tranfer Protocol +ddp 37 DDP # Datagram Delivery Protocol +idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport +ipv6 41 IPv6 # IPv6 +ipv6-route 43 IPv6-Route # Routing Header for IPv6 +ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6 +idrp 45 IDRP # Inter-Domain Routing Protocol +rsvp 46 RSVP # Reservation Protocol +gre 47 GRE # General Routing Encapsulation +esp 50 ESP # Encap Security Payload for IPv6 +ah 51 AH # Authentication Header for IPv6 +skip 57 SKIP # SKIP +ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6 +ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6 +ipv6-opts 60 IPv6-Opts # Destination Options for IPv6 +rspf 73 RSPF # Radio Shortest Path First. +vmtp 81 VMTP # Versatile Message Transport +ospf 89 OSPFIGP # Open Shortest Path First IGP +ipip 94 IPIP # IP-within-IP Encapsulation Protocol +encap 98 ENCAP # Yet Another IP encapsulation +pim 103 PIM # Protocol Independent Multicast diff --git a/main/alpine-baselayout/services b/main/alpine-baselayout/services new file mode 100644 index 000000000..c16f0ccf9 --- /dev/null +++ b/main/alpine-baselayout/services @@ -0,0 +1,1184 @@ +# /etc/services +# +# Network services, Internet style +# +# Note that it is presently the policy of IANA to assign a single well-known +# port number for both TCP and UDP; hence, most entries here have two entries +# even if the protocol doesn't support UDP operations. +# +# Some References: +# http://www.iana.org/assignments/port-numbers +# http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/services +# +# Each line describes one service, and is of the form: +# service-name port/protocol [aliases ...] [# comment] +# +# See services(5) for more info. +# + +# +# IANA Assignments [Well Known Ports] +# The Well Known Ports are assigned by the IANA and on most systems can +# only be used by system (or root) processes or by programs executed by +# privileged users. +# The range for assigned ports managed by the IANA is 0-1023. +# +tcpmux 1/tcp # TCP port service multiplexer +tcpmux 1/udp +compressnet 2/tcp # Management Utility +compressnet 2/udp +compressnet 3/tcp # Compression Process +compressnet 3/udp +rje 5/tcp # Remote Job Entry +rje 5/udp +echo 7/tcp # Echo +echo 7/udp +discard 9/tcp sink null # Discard +discard 9/udp sink null +systat 11/tcp users # Active Users +systat 11/udp users +daytime 13/tcp # Daytime (RFC 867) +daytime 13/udp +#netstat 15/tcp # (was once asssigned, no more) +qotd 17/tcp quote # Quote of the Day +qotd 17/udp quote +msp 18/tcp # Message Send Protocol +msp 18/udp +chargen 19/tcp ttytst source # Character Generator +chargen 19/udp ttytst source +ftp-data 20/tcp # File Transfer [Default Data] +ftp-data 20/udp +ftp 21/tcp # File Transfer [Control] +ftp 21/udp fsp fspd +ssh 22/tcp # SSH Remote Login Protocol +ssh 22/udp +telnet 23/tcp # Telnet +telnet 23/udp +# private 24/tcp # any private mail system +# private 24/udp +smtp 25/tcp mail # Simple Mail Transfer +smtp 25/udp +nsw-fe 27/tcp # NSW User System FE +nsw-fe 27/udp +msg-icp 29/tcp # MSG ICP +msg-icp 29/udp +msg-auth 31/tcp # MSG Authentication +msg-auth 31/udp +dsp 33/tcp # Display Support Protocol +dsp 33/udp +# private 35/tcp # any private printer server +# private 35/udp +time 37/tcp timserver +time 37/udp timserver +rap 38/tcp # Route Access Protocol +rap 38/udp +rlp 39/tcp resource # Resource Location Protocol +rlp 39/udp resource +graphics 41/tcp # Graphics +graphics 41/udp +nameserver 42/tcp name # Host Name Server +nameserver 42/udp name +nicname 43/tcp whois # Who Is +nicname 43/udp whois +mpm-flags 44/tcp # MPM FLAGS Protocol +mpm-flags 44/udp +mpm 45/tcp # Message Processing Module [recv] +mpm 45/udp +mpm-snd 46/tcp # MPM [default send] +mpm-snd 46/udp +ni-ftp 47/tcp # NI FTP +ni-ftp 47/udp +auditd 48/tcp # Digital Audit Daemon +auditd 48/udp +tacacs 49/tcp # Login Host Protocol (TACACS) +tacacs 49/udp +re-mail-ck 50/tcp # Remote Mail Checking Protocol +re-mail-ck 50/udp +domain 53/tcp # Domain Name Server +domain 53/udp +xns-ch 54/tcp # XNS Clearinghouse +xns-ch 54/udp +isi-gl 55/tcp # ISI Graphics Language +isi-gl 55/udp +xns-auth 56/tcp # XNS Authentication +xns-auth 56/udp +# private 57/tcp # any private terminal access +# private 57/udp +xns-mail 58/tcp # XNS Mail +xns-mail 58/udp +# private 59/tcp # any private file service +# private 59/udp +ni-mail 61/tcp # NI MAIL +ni-mail 61/udp +acas 62/tcp # ACA Services +acas 62/udp +whois++ 63/tcp # whois++ +whois++ 63/udp +covia 64/tcp # Communications Integrator (CI) +covia 64/udp +tacacs-ds 65/tcp # TACACS-Database Service +tacacs-ds 65/udp +sql*net 66/tcp # Oracle SQL*NET +sql*net 66/udp +bootps 67/tcp # Bootstrap Protocol Server (BOOTP) +bootps 67/udp +bootpc 68/tcp # Bootstrap Protocol Client (BOOTP) +bootpc 68/udp +tftp 69/tcp # Trivial File Transfer +tftp 69/udp +gopher 70/tcp # Gopher +gopher 70/udp +netrjs-1 71/tcp # Remote Job Service +netrjs-1 71/udp +netrjs-2 72/tcp +netrjs-2 72/udp +netrjs-3 73/tcp +netrjs-3 73/udp +netrjs-4 74/tcp +netrjs-4 74/udp +# private 75/tcp # any private dial out service +# private 75/udp +deos 76/tcp # Distributed External Object Store +deos 76/udp +# private 77/tcp # any private RJE service +# private 77/udp +vettcp 78/tcp # vettcp +vettcp 78/udp +finger 79/tcp # Finger +finger 79/udp +http 80/tcp www www-http # World Wide Web HTTP +http 80/udp www www-http +hosts2-ns 81/tcp # HOSTS2 Name Server +hosts2-ns 81/udp +xfer 82/tcp # XFER Utility +xfer 82/udp +mit-ml-dev 83/tcp # MIT ML Device +mit-ml-dev 83/udp +ctf 84/tcp # Common Trace Facility +ctf 84/udp +mit-ml-dev 85/tcp # MIT ML Device +mit-ml-dev 85/udp +mfcobol 86/tcp # Micro Focus Cobol +mfcobol 86/udp +# private 87/tcp # any private terminal link +# private 87/udp +kerberos 88/tcp kerberos5 krb5 # Kerberos +kerberos 88/udp kerberos5 krb5 +su-mit-tg 89/tcp # SU/MIT Telnet Gateway +su-mit-tg 89/udp +dnsix 90/tcp # DNSIX Securit Attribute Token Map +dnsix 90/udp +mit-dov 91/tcp # MIT Dover Spooler +mit-dov 91/udp +npp 92/tcp # Network Printing Protocol +npp 92/udp +dcp 93/tcp # Device Control Protocol +dcp 93/udp +objcall 94/tcp # Tivoli Object Dispatcher +objcall 94/udp +supdup 95/tcp # SUPDUP +supdup 95/udp +dixie 96/tcp # DIXIE Protocol Specification +dixie 96/udp +swift-rvf 97/tcp # Swift Remote Virtural File Protocol +swift-rvf 97/udp +tacnews 98/tcp linuxconf # TAC News +tacnews 98/udp +metagram 99/tcp # Metagram Relay +metagram 99/udp +#newacct 100/tcp # [unauthorized use] +hostname 101/tcp hostnames # NIC Host Name Server +hostname 101/udp hostnames +iso-tsap 102/tcp tsap # ISO-TSAP Class 0 +iso-tsap 102/udp tsap +gppitnp 103/tcp # Genesis Point-to-Point Trans Net +gppitnp 103/udp +acr-nema 104/tcp # ACR-NEMA Digital Imag. & Comm. 300 +acr-nema 104/udp +cso 105/tcp csnet-ns cso-ns # CCSO name server protocol +cso 105/udp csnet-ns cso-ns +3com-tsmux 106/tcp poppassd # 3COM-TSMUX +3com-tsmux 106/udp poppassd # Eudora: Unauthorized use by insecure poppassd protocol +rtelnet 107/tcp # Remote Telnet Service +rtelnet 107/udp +snagas 108/tcp # SNA Gateway Access Server +snagas 108/udp +pop2 109/tcp pop-2 postoffice# Post Office Protocol - Version 2 +pop2 109/udp pop-2 +pop3 110/tcp pop-3 # Post Office Protocol - Version 3 +pop3 110/udp pop-3 +sunrpc 111/tcp portmapper rpcbind # SUN Remote Procedure Call +sunrpc 111/udp portmapper rpcbind +mcidas 112/tcp # McIDAS Data Transmission Protocol +mcidas 112/udp +auth 113/tcp authentication tap ident # Authentication Service +auth 113/udp +sftp 115/tcp # Simple File Transfer Protocol +sftp 115/udp +ansanotify 116/tcp # ANSA REX Notify +ansanotify 116/udp +uucp-path 117/tcp # UUCP Path Service +uucp-path 117/udp +sqlserv 118/tcp # SQL Services +sqlserv 118/udp +nntp 119/tcp readnews untp # Network News Transfer Protocol +nntp 119/udp readnews untp +cfdptkt 120/tcp # CFDPTKT +cfdptkt 120/udp +erpc 121/tcp # Encore Expedited Remote Pro.Call +erpc 121/udp +smakynet 122/tcp # SMAKYNET +smakynet 122/udp +ntp 123/tcp # Network Time Protocol +ntp 123/udp +ansatrader 124/tcp # ANSA REX Trader +ansatrader 124/udp +locus-map 125/tcp # Locus PC-Interface Net Map Ser +locus-map 125/udp +nxedit 126/tcp unitary # NXEdit +nxedit 126/udp unitary # Unisys Unitary Login +locus-con 127/tcp # Locus PC-Interface Conn Server +locus-con 127/udp +gss-xlicen 128/tcp # GSS X License Verification +gss-xlicen 128/udp +pwdgen 129/tcp # Password Generator Protocol +pwdgen 129/udp +cisco-fna 130/tcp # cisco FNATIVE +cisco-fna 130/udp +cisco-tna 131/tcp # cisco TNATIVE +cisco-tna 131/udp +cisco-sys 132/tcp # cisco SYSMAINT +cisco-sys 132/udp +statsrv 133/tcp # Statistics Service +statsrv 133/udp +ingres-net 134/tcp # INGRES-NET Service +ingres-net 134/udp +epmap 135/tcp loc-srv # DCE endpoint resolution +epmap 135/udp loc-srv +profile 136/tcp # PROFILE Naming System +profile 136/udp +netbios-ns 137/tcp # NETBIOS Name Service +netbios-ns 137/udp +netbios-dgm 138/tcp # NETBIOS Datagram Service +netbios-dgm 138/udp +netbios-ssn 139/tcp # NETBIOS Session Service +netbios-ssn 139/udp +emfis-data 140/tcp # EMFIS Data Service +emfis-data 140/udp +emfis-cntl 141/tcp # EMFIS Control Service +emfis-cntl 141/udp +imap 143/tcp imap2 # Internet Message Access Protocol +imap 143/udp imap2 +uma 144/tcp # Universal Management Architecture +uma 144/udp +uaac 145/tcp # UAAC Protocol +uaac 145/udp +iso-tp0 146/tcp # ISO-TP0 +iso-tp0 146/udp +iso-ip 147/tcp # ISO-IP +iso-ip 147/udp +jargon 148/tcp # Jargon +jargon 148/udp +aed-512 149/tcp # AED 512 Emulation Service +aed-512 149/udp +sql-net 150/tcp # SQL-NET +sql-net 150/udp +hems 151/tcp # HEMS +hems 151/udp +bftp 152/tcp # Background File Transfer Program +bftp 152/udp +sgmp 153/tcp # SGMP +sgmp 153/udp +netsc-prod 154/tcp # NETSC +netsc-prod 154/udp +netsc-dev 155/tcp +netsc-dev 155/udp +sqlsrv 156/tcp # SQL Service +sqlsrv 156/udp +knet-cmp 157/tcp # KNET/VM Command/Message Protocol +knet-cmp 157/udp +pcmail-srv 158/tcp # PCMail Server +pcmail-srv 158/udp +nss-routing 159/tcp # NSS-Routing +nss-routing 159/udp +sgmp-traps 160/tcp # SGMP-TRAPS +sgmp-traps 160/udp +snmp 161/tcp # Simple Net Mgmt Proto +snmp 161/udp +snmptrap 162/tcp snmp-trap # Traps for SNMP +snmptrap 162/udp snmp-trap +cmip-man 163/tcp # CMIP/TCP Manager +cmip-man 163/udp +cmip-agent 164/tcp # CMIP/TCP Agent +cmip-agent 164/udp +xns-courier 165/tcp # Xerox +xns-courier 165/udp +s-net 166/tcp # Sirius Systems +s-net 166/udp +namp 167/tcp # NAMP +namp 167/udp +rsvd 168/tcp # RSVD +rsvd 168/udp +send 169/tcp # SEND +send 169/udp +print-srv 170/tcp # Network PostScript +print-srv 170/udp +multiplex 171/tcp # Network Innovations Multiplex +multiplex 171/udp +cl/1 172/tcp # Network Innovations CL/1 +cl/1 172/udp +xyplex-mux 173/tcp # Xyplex +xyplex-mux 173/udp +mailq 174/tcp # Mailer transport queue for Zmailer +mailq 174/udp +vmnet 175/tcp # VMNET +vmnet 175/udp +genrad-mux 176/tcp # GENRAD-MUX +genrad-mux 176/udp +xdmcp 177/tcp # X Display Manager Control Protocol +xdmcp 177/udp +nextstep 178/tcp NeXTStep NextStep# NextStep Window Server +nextstep 178/udp NeXTStep NextStep +bgp 179/tcp # Border Gateway Protocol +bgp 179/udp +ris 180/tcp # Intergraph +ris 180/udp +unify 181/tcp # Unify +unify 181/udp +audit 182/tcp # Unisys Audit SITP +audit 182/udp +ocbinder 183/tcp # OCBinder +ocbinder 183/udp +ocserver 184/tcp # OCServer +ocserver 184/udp +remote-kis 185/tcp # Remote-KIS +remote-kis 185/udp +kis 186/tcp # KIS Protocol +kis 186/udp +aci 187/tcp # Application Communication Interface +aci 187/udp +mumps 188/tcp # Plus Five's MUMPS +mumps 188/udp +qft 189/tcp # Queued File Transport +qft 189/udp +gacp 190/tcp # Gateway Access Control Protocol +gacp 190/udp +prospero 191/tcp # Prospero Directory Service +prospero 191/udp +osu-nms 192/tcp # OSU Network Monitoring System +osu-nms 192/udp +srmp 193/tcp # Spider Remote Monitoring Protocol +srmp 193/udp +irc 194/tcp # Internet Relay Chat Protocol +irc 194/udp +dn6-nlm-aud 195/tcp # DNSIX Network Level Module Audit +dn6-nlm-aud 195/udp +dn6-smm-red 196/tcp # DNSIX Session Mgt Module Audit Redir +dn6-smm-red 196/udp +dls 197/tcp # Directory Location Service +dls 197/udp +dls-mon 198/tcp # Directory Location Service Monitor +dls-mon 198/udp +smux 199/tcp # SNMP Unix Multiplexer +smux 199/udp +src 200/tcp # IBM System Resource Controller +src 200/udp +at-rtmp 201/tcp # AppleTalk Routing Maintenance +at-rtmp 201/udp +at-nbp 202/tcp # AppleTalk Name Binding +at-nbp 202/udp +at-echo 204/tcp # AppleTalk Echo +at-echo 204/udp +at-zis 206/tcp # AppleTalk Zone Information +at-zis 206/udp +qmtp 209/tcp # The Quick Mail Transfer Protocol +qmtp 209/udp +z39.50 210/tcp wais z3950 # ANSI Z39.50 +z39.50 210/udp wais z3950 +914c/g 211/tcp # Texas Instruments 914C/G Terminal +914c/g 211/udp +anet 212/tcp # ATEXSSTR +anet 212/udp +ipx 213/tcp # IPX +ipx 213/udp +imap3 220/tcp # Interactive Mail Access +imap3 220/udp +link 245/tcp # ttylink +link 245/udp +pawserv 345/tcp # Perf Analysis Workbench +pawserv 345/udp +zserv 346/tcp # Zebra server +zserv 346/udp +fatserv 347/tcp # Fatmen Server +fatserv 347/udp +scoi2odialog 360/tcp # scoi2odialog +scoi2odialog 360/udp +semantix 361/tcp # Semantix +semantix 361/udp +srssend 362/tcp # SRS Send +srssend 362/udp +rsvp_tunnel 363/tcp # RSVP Tunnel +rsvp_tunnel 363/udp +aurora-cmgr 364/tcp # Aurora CMGR +aurora-cmgr 364/udp +dtk 365/tcp # Deception Tool Kit +dtk 365/udp +odmr 366/tcp # ODMR +odmr 366/udp +rpc2portmap 369/tcp # Coda portmapper +rpc2portmap 369/udp +codaauth2 370/tcp # Coda authentication server +codaauth2 370/udp +clearcase 371/tcp # Clearcase +clearcase 371/udp +ulistproc 372/tcp ulistserv # UNIX Listserv +ulistproc 372/udp ulistserv +ldap 389/tcp # Lightweight Directory Access Protocol +ldap 389/udp +imsp 406/tcp # Interactive Mail Support Protocol +imsp 406/udp +svrloc 427/tcp # Server Location +svrloc 427/udp +mobileip-agent 434/tcp # MobileIP-Agent +mobileip-agent 434/udp +mobilip-mn 435/tcp # MobilIP-MN +mobilip-mn 435/udp +https 443/tcp # MCom +https 443/udp +snpp 444/tcp # Simple Network Paging Protocol +snpp 444/udp +microsoft-ds 445/tcp Microsoft-DS +microsoft-ds 445/udp Microsoft-DS +kpasswd 464/tcp kpwd # Kerberos "passwd" +kpasswd 464/udp kpwd +urd 465/tcp smtps ssmtp # URL Rendesvous Directory for SSM / smtp protocol over TLS/SSL +igmpv3lite 465/udp smtps ssmtp # IGMP over UDP for SSM +photuris 468/tcp +photuris 468/udp +rcp 469/tcp # Radio Control Protocol +rcp 469/udp +saft 487/tcp # Simple Asynchronous File Transfer +saft 487/udp +gss-http 488/tcp +gss-http 488/udp +pim-rp-disc 496/tcp +pim-rp-disc 496/udp +isakmp 500/tcp # IPsec - Internet Security Association and Key Management Protocol +isakmp 500/udp +exec 512/tcp # remote process execution +comsat 512/udp biff # notify users of new mail received +login 513/tcp # remote login a la telnet +who 513/udp whod # who's logged in to machines +shell 514/tcp cmd # no passwords used +syslog 514/udp +printer 515/tcp spooler # line printer spooler +printer 515/udp spooler +videotex 516/tcp +videotex 516/udp +talk 517/tcp # like tenex link +talk 517/udp +ntalk 518/tcp +ntalk 518/udp +utime 519/tcp unixtime +utime 519/udp unixtime +efs 520/tcp # extended file name server +router 520/udp route routed # local routing process +ripng 521/tcp +ripng 521/udp +ulp 522/tcp +ulp 522/udp +ibm-db2 523/tcp +ibm-db2 523/udp +ncp 524/tcp +ncp 524/udp +timed 525/tcp timeserver +timed 525/udp timeserver +tempo 526/tcp newdate +tempo 526/udp newdate +courier 530/tcp rpc +courier 530/udp rpc +conference 531/tcp chat +conference 531/udp chat +netnews 532/tcp readnews +netnews 532/udp readnews +netwall 533/tcp # -for emergency broadcasts +netwall 533/udp +mm-admin 534/tcp # MegaMedia Admin +mm-admin 534/udp +iiop 535/tcp +iiop 535/udp +opalis-rdv 536/tcp +opalis-rdv 536/udp +nmsp 537/tcp # Networked Media Streaming Protocol +nmsp 537/udp +gdomap 538/tcp # GNUstep distributed objects +gdomap 538/udp +uucp 540/tcp uucpd # uucp daemon +uucp 540/udp uucpd +klogin 543/tcp # Kerberized `rlogin' (v5) +klogin 543/udp +kshell 544/tcp krcmd # Kerberized `rsh' (v5) +kshell 544/udp krcmd +appleqtcsrvr 545/tcp +appleqtcsrvr 545/udp +dhcpv6-client 546/tcp # DHCPv6 Client +dhcpv6-client 546/udp +dhcpv6-server 547/tcp # DHCPv6 Server +dhcpv6-server 547/udp +afpovertcp 548/tcp # AFP over TCP +afpovertcp 548/udp +rtsp 554/tcp # Real Time Stream Control Protocol +rtsp 554/udp +dsf 555/tcp +dsf 555/udp +remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem +remotefs 556/udp rfs_server rfs +nntps 563/tcp snntp # NNTP over SSL +nntps 563/udp snntp +9pfs 564/tcp # plan 9 file service +9pfs 564/udp +whoami 565/tcp +whoami 565/udp +submission 587/tcp # mail message submission +submission 587/udp +http-alt 591/tcp # FileMaker, Inc. - HTTP Alternate +http-alt 591/udp +nqs 607/tcp # Network Queuing system +nqs 607/udp +npmp-local 610/tcp dqs313_qmaster # npmp-local / DQS +npmp-local 610/udp dqs313_qmaster +npmp-gui 611/tcp dqs313_execd # npmp-gui / DQS +npmp-gui 611/udp dqs313_execd +hmmp-ind 612/tcp dqs313_intercell# HMMP Indication / DQS +hmmp-ind 612/udp dqs313_intercell +cryptoadmin 624/tcp # Crypto Admin +cryptoadmin 624/udp +dec_dlm 625/tcp # DEC DLM +dec_dlm 625/udp +asia 626/tcp +asia 626/udp +passgo-tivoli 627/tcp # PassGo Tivoli +passgo-tivoli 627/udp +qmqp 628/tcp # Qmail QMQP +qmqp 628/udp +3com-amp3 629/tcp +3com-amp3 629/udp +rda 630/tcp +rda 630/udp +ipp 631/tcp # Internet Printing Protocol +ipp 631/udp +ldaps 636/tcp # LDAP over SSL +ldaps 636/udp +tinc 655/tcp # TINC control port +tinc 655/udp +acap 674/tcp # Application Configuration Access Protocol +acap 674/udp +asipregistry 687/tcp +asipregistry 687/udp +realm-rusd 688/tcp # ApplianceWare managment protocol +realm-rusd 688/udp +nmap 689/tcp # Opensource Network Mapper +nmap 689/udp +ha-cluster 694/tcp # Heartbeat HA-cluster +ha-cluster 694/udp +epp 700/tcp # Extensible Provisioning Protocol +epp 700/udp +iris-beep 702/tcp # IRIS over BEEP +iris-beep 702/udp +silc 706/tcp # SILC +silc 706/udp +kerberos-adm 749/tcp # Kerberos `kadmin' (v5) +kerberos-adm 749/udp +kerberos-iv 750/tcp kerberos4 kdc # Kerberos (server) +kerberos-iv 750/udp kerberos4 kdc +pump 751/tcp kerberos_master +pump 751/udp kerberos_master # Kerberos authentication +qrh 752/tcp passwd_server +qrh 752/udp passwd_server # Kerberos passwd server +rrh 753/tcp +rrh 753/udp +tell 754/tcp send krb_prop krb5_prop # Kerberos slave propagation +tell 754/udp send +nlogin 758/tcp +nlogin 758/udp +con 759/tcp +con 759/udp +ns 760/tcp krbupdate kreg # Kerberos registration +ns 760/udp +webster 765/tcp # Network dictionary +webster 765/udp +phonebook 767/tcp # Network phonebook +phonebook 767/udp +rsync 873/tcp # rsync +rsync 873/udp +ftps-data 989/tcp # ftp protocol, data, over TLS/SSL +ftps-data 989/udp +ftps 990/tcp # ftp protocol, control, over TLS/SSL +ftps 990/udp +nas 991/tcp # Netnews Administration System +nas 991/udp +telnets 992/tcp # telnet protocol over TLS/SSL +telnets 992/udp +imaps 993/tcp # imap4 protocol over TLS/SSL +imaps 993/udp +ircs 994/tcp # irc protocol over TLS/SSL +ircs 994/udp +pop3s 995/tcp # pop3 protocol over TLS/SSL +pop3s 995/udp + +# +# IANA Assignments [Registered Ports] +# +# The Registered Ports are listed by the IANA and on most systems can be +# used by ordinary user processes or programs executed by ordinary +# users. +# Ports are used in the TCP [RFC793] to name the ends of logical +# connections which carry long term conversations. For the purpose of +# providing services to unknown callers, a service contact port is +# defined. This list specifies the port used by the server process as +# its contact port. +# The IANA registers uses of these ports as a convenience to the +# community. +# To the extent possible, these same port assignments are used with the +# UDP [RFC768]. +# The Registered Ports are in the range 1024-49151. +# +imgames 1077/tcp +imgames 1077/udp +socks 1080/tcp # socks proxy server +socks 1080/udp +rmiregistry 1099/tcp # Java RMI Registry +rmiregistry 1099/udp +bnetgame 1119/tcp # Battle.net Chat/Game Protocol +bnetgame 1119/udp +bnetfile 1120/tcp # Battle.net File Transfer Protocol +bnetfile 1120/udp +hpvmmcontrol 1124/tcp # HP VMM Control +hpvmmcontrol 1124/udp +hpvmmagent 1125/tcp # HP VMM Agent +hpvmmagent 1125/udp +hpvmmdata 1126/tcp # HP VMM Agent +hpvmmdata 1126/udp +resacommunity 1154/tcp # Community Service +resacommunity 1154/udp +3comnetman 1181/tcp # 3Com Net Management +3comnetman 1181/udp +mysql-cluster 1186/tcp # MySQL Cluster Manager +mysql-cluster 1186/udp +alias 1187/tcp # Alias Service +alias 1187/udp +openvpn 1194/tcp # OpenVPN +openvpn 1194/udp +kazaa 1214/tcp # KAZAA +kazaa 1214/udp +bvcontrol 1236/tcp rmtcfg # Gracilis Packeten remote config server +bvcontrol 1236/udp rmtcfg +nessus 1241/tcp # Nessus vulnerability assessment scanner +nessus 1241/udp +h323hostcallsc 1300/tcp # H323 Host Call Secure +h323hostcallsc 1300/udp +lotusnote 1352/tcp # Lotus Note +lotusnote 1352/udp +ms-sql-s 1433/tcp # Microsoft-SQL-Server +ms-sql-s 1433/udp +ms-sql-m 1434/tcp # Microsoft-SQL-Monitor +ms-sql-m 1434/udp +ica 1494/tcp # Citrix ICA Client +ica 1494/udp +wins 1512/tcp # Microsoft's Windows Internet Name Service +wins 1512/udp +ingreslock 1524/tcp +ingreslock 1524/udp +prospero-np 1525/tcp # Prospero non-privileged +prospero-np 1525/udp +datametrics 1645/tcp old-radius # datametrics / old radius entry +datametrics 1645/udp old-radius +sa-msg-port 1646/tcp old-radacct # sa-msg-port / old radacct entry +sa-msg-port 1646/udp old-radacct +rsap 1647/tcp +rsap 1647/udp +concurrent-lm 1648/tcp +concurrent-lm 1648/udp +kermit 1649/tcp +kermit 1649/udp +l2tp 1701/tcp +l2tp 1701/udp +h323gatedisc 1718/tcp +h323gatedisc 1718/udp +h323gatestat 1719/tcp +h323gatestat 1719/udp +h323hostcall 1720/tcp +h323hostcall 1720/udp +iberiagames 1726/tcp +iberiagames 1726/udp +gamegen1 1738/tcp +gamegen1 1738/udp +tftp-mcast 1758/tcp +tftp-mcast 1758/udp +hello 1789/tcp +hello 1789/udp +radius 1812/tcp # Radius +radius 1812/udp +radius-acct 1813/tcp radacct # Radius Accounting +radius-acct 1813/udp radacct +mtp 1911/tcp # Starlight Networks Multimedia Transport Protocol +mtp 1911/udp +egs 1926/tcp # Evolution Game Server +egs 1926/udp +unix-status 1957/tcp # remstats unix-status server +unix-status 1957/udp +hsrp 1985/tcp # Hot Standby Router Protocol +hsrp 1985/udp +licensedaemon 1986/tcp # cisco license management +licensedaemon 1986/udp +tr-rsrb-p1 1987/tcp # cisco RSRB Priority 1 port +tr-rsrb-p1 1987/udp +tr-rsrb-p2 1988/tcp # cisco RSRB Priority 2 port +tr-rsrb-p2 1988/udp +tr-rsrb-p3 1989/tcp # cisco RSRB Priority 3 port +tr-rsrb-p3 1989/udp +stun-p1 1990/tcp # cisco STUN Priority 1 port +stun-p1 1990/udp +stun-p2 1991/tcp # cisco STUN Priority 2 port +stun-p2 1991/udp +stun-p3 1992/tcp # cisco STUN Priority 3 port +stun-p3 1992/udp +snmp-tcp-port 1994/tcp # cisco SNMP TCP port +snmp-tcp-port 1994/udp +stun-port 1995/tcp # cisco serial tunnel port +stun-port 1995/udp +perf-port 1996/tcp # cisco Remote SRB port +perf-port 1996/udp +gdp-port 1997/tcp # cisco Gateway Discovery Protocol +gdp-port 1997/udp +x25-svc-port 1998/tcp # cisco X.25 service (XOT) +x25-svc-port 1998/udp +tcp-id-port 1999/tcp # cisco identification port +tcp-id-port 1999/udp +cisco-sccp 2000/tcp sieve # Cisco SCCP +cisco-sccp 2000/udp sieve +nfs 2049/tcp # Network File System +nfs 2049/udp +radsec 2083/tcp # Secure Radius Service +radsec 2083/udp +gnunet 2086/tcp # GNUnet +gnunet 2086/udp +rtcm-sc104 2101/tcp # RTCM SC-104 +rtcm-sc104 2101/udp +zephyr-srv 2102/tcp # Zephyr server +zephyr-srv 2102/udp +zephyr-clt 2103/tcp # Zephyr serv-hm connection +zephyr-clt 2103/udp +zephyr-hm 2104/tcp # Zephyr hostmanager +zephyr-hm 2104/udp +eyetv 2170/tcp # EyeTV Server Port +eyetv 2170/udp +msfw-storage 2171/tcp # MS Firewall Storage +msfw-storage 2171/udp +msfw-s-storage 2172/tcp # MS Firewall SecureStorage +msfw-s-storage 2172/udp +msfw-replica 2173/tcp # MS Firewall Replication +msfw-replica 2173/udp +msfw-array 2174/tcp # MS Firewall Intra Array +msfw-array 2174/udp +airsync 2175/tcp # Microsoft Desktop AirSync Protocol +airsync 2175/udp +rapi 2176/tcp # Microsoft ActiveSync Remote API +rapi 2176/udp +qwave 2177/tcp # qWAVE Bandwidth Estimate +qwave 2177/udp +tivoconnect 2190/tcp # TiVoConnect Beacon +tivoconnect 2190/udp +tvbus 2191/tcp # TvBus Messaging +tvbus 2191/udp +mysql-im 2273/tcp # MySQL Instance Manager +mysql-im 2273/udp +dict-lookup 2289/tcp # Lookup dict server +dict-lookup 2289/udp +redstorm_join 2346/tcp # Game Connection Port +redstorm_join 2346/udp +redstorm_find 2347/tcp # Game Announcement and Location +redstorm_find 2347/udp +redstorm_info 2348/tcp # Information to query for game status +redstorm_info 2348/udp +cvspserver 2401/tcp # CVS client/server operations +cvspserver 2401/udp +venus 2430/tcp # codacon port +venus 2430/udp +venus-se 2431/tcp # tcp side effects +venus-se 2431/udp +codasrv 2432/tcp # not used +codasrv 2432/udp +codasrv-se 2433/tcp # tcp side effects +codasrv-se 2433/udp +netadmin 2450/tcp +netadmin 2450/udp +netchat 2451/tcp +netchat 2451/udp +snifferclient 2452/tcp +snifferclient 2452/udp +ppcontrol 2505/tcp # PowerPlay Control +ppcontrol 2505/udp +lstp 2559/tcp # +lstp 2559/udp +mon 2583/tcp +mon 2583/udp +hpstgmgr 2600/tcp zebrasrv +hpstgmgr 2600/udp zebrasrv +discp-client 2601/tcp zebra # discp client +discp-client 2601/udp zebra +discp-server 2602/tcp ripd # discp server +discp-server 2602/udp ripd +servicemeter 2603/tcp ripngd # Service Meter +servicemeter 2603/udp ripngd +nsc-ccs 2604/tcp ospfd # NSC CCS +nsc-ccs 2604/udp ospfd +nsc-posa 2605/tcp bgpd # NSC POSA +nsc-posa 2605/udp bgpd +netmon 2606/tcp ospf6d # Dell Netmon +netmon 2606/udp ospf6d +connection 2607/tcp # Dell Connection +connection 2607/udp +wag-service 2608/tcp # Wag Service +wag-service 2608/udp +dict 2628/tcp # Dictionary server +dict 2628/udp +exce 2769/tcp # eXcE +exce 2769/udp +dvr-esm 2804/tcp # March Networks Digital Video Recorders and Enterprise Service Manager products +dvr-esm 2804/udp +corbaloc 2809/tcp # CORBA LOC +corbaloc 2809/udp +ndtp 2882/tcp # Network Dictionary Transfer Protocol +ndtp 2882/udp +gamelobby 2914/tcp # Game Lobby +gamelobby 2914/udp +gds_db 3050/tcp # InterBase server +gds_db 3050/udp +xbox 3074/tcp # Xbox game port +xbox 3074/udp +icpv2 3130/tcp icp # Internet Cache Protocol (Squid) +icpv2 3130/udp icp +nm-game-admin 3148/tcp # NetMike Game Administrator +nm-game-admin 3148/udp +nm-game-server 3149/tcp # NetMike Game Server +nm-game-server 3149/udp +mysql 3306/tcp # MySQL +mysql 3306/udp +sftu 3326/tcp +sftu 3326/udp +trnsprntproxy 3346/tcp # Transparent Proxy +trnsprntproxy 3346/udp +ms-wbt-server 3389/tcp rdp # MS WBT Server +ms-wbt-server 3389/udp rdp # Microsoft Remote Desktop Protocol +prsvp 3455/tcp # RSVP Port +prsvp 3455/udp +nut 3493/tcp # Network UPS Tools +nut 3493/udp +ironstorm 3504/tcp # IronStorm game server +ironstorm 3504/udp +cctv-port 3559/tcp # CCTV control port +cctv-port 3559/udp +iw-mmogame 3596/tcp # Illusion Wireless MMOG +iw-mmogame 3596/udp +distcc 3632/tcp # Distributed Compiler +distcc 3632/udp +daap 3689/tcp # Digital Audio Access Protocol +daap 3689/udp +svn 3690/tcp # Subversion +svn 3690/udp +blizwow 3724/tcp # World of Warcraft +blizwow 3724/udp +netboot-pxe 3928/tcp pxe # PXE NetBoot Manager +netboot-pxe 3928/udp pxe +smauth-port 3929/tcp # AMS Port +smauth-port 3929/udp +treehopper 3959/tcp # Tree Hopper Networking +treehopper 3959/udp +cobraclient 3970/tcp # Cobra Client +cobraclient 3970/udp +cobraserver 3971/tcp # Cobra Server +cobraserver 3971/udp +pxc-spvr-ft 4002/tcp pxc-spvr-ft +pxc-spvr-ft 4002/udp pxc-spvr-ft +pxc-splr-ft 4003/tcp pxc-splr-ft rquotad +pxc-splr-ft 4003/udp pxc-splr-ft rquotad +pxc-roid 4004/tcp pxc-roid +pxc-roid 4004/udp pxc-roid +pxc-pin 4005/tcp pxc-pin +pxc-pin 4005/udp pxc-pin +pxc-spvr 4006/tcp pxc-spvr +pxc-spvr 4006/udp pxc-spvr +pxc-splr 4007/tcp pxc-splr +pxc-splr 4007/udp pxc-splr +xgrid 4111/tcp # Mac OS X Server Xgrid +xgrid 4111/udp +bzr 4155/tcp # Bazaar Version Control System +bzr 4155/udp # Bazaar version control system +rwhois 4321/tcp # Remote Who Is +rwhois 4321/udp +epmd 4369/tcp # Erlang Port Mapper Daemon +epmd 4369/udp +krb524 4444/tcp +krb524 4444/udp +ipsec-nat-t 4500/tcp # IPsec NAT-Traversal +ipsec-nat-t 4500/udp +hylafax 4559/tcp # HylaFAX client-server protocol (new) +hylafax 4559/udp +piranha1 4600/tcp +piranha1 4600/udp +playsta2-app 4658/tcp # PlayStation2 App Port +playsta2-app 4658/udp +playsta2-lob 4659/tcp # PlayStation2 Lobby Port +playsta2-lob 4659/udp +snap 4752/tcp # Simple Network Audio Protocol +snap 4752/udp +radmin-port 4899/tcp # RAdmin Port +radmin-port 4899/udp +rfe 5002/tcp # Radio Free Ethernet +rfe 5002/udp +ita-agent 5051/tcp # ITA Agent +ita-agent 5051/udp +sdl-ets 5081/tcp # SDL - Ent Trans Server +sdl-ets 5081/udp +bzflag 5154/tcp # BZFlag game server +bzflag 5154/udp +aol 5190/tcp # America-Online +aol 5190/udp +xmpp-client 5222/tcp # XMPP Client Connection +xmpp-client 5222/udp +caevms 5251/tcp # CA eTrust VM Service +caevms 5251/udp +xmpp-server 5269/tcp # XMPP Server Connection +xmpp-server 5269/udp +cfengine 5308/tcp # CFengine +cfengine 5308/udp +nat-pmp 5351/tcp # NAT Port Mapping Protocol +nat-pmp 5351/udp +dns-llq 5352/tcp # DNS Long-Lived Queries +dns-llq 5352/udp +mdns 5353/tcp # Multicast DNS +mdns 5353/udp +mdnsresponder 5354/tcp noclog # Multicast DNS Responder IPC +mdnsresponder 5354/udp noclog # noclogd with TCP (nocol) +llmnr 5355/tcp hostmon # Link-Local Multicast Name Resolution +llmnr 5355/udp hostmon # hostmon uses TCP (nocol) +dj-ice 5419/tcp +dj-ice 5419/udp +beyond-remote 5424/tcp # Beyond Remote +beyond-remote 5424/udp +br-channel 5425/tcp # Beyond Remote Command Channel +br-channel 5425/udp +postgresql 5432/tcp # POSTGRES +postgresql 5432/udp +sgi-eventmond 5553/tcp # SGI Eventmond Port +sgi-eventmond 5553/udp +sgi-esphttp 5554/tcp # SGI ESP HTTP +sgi-esphttp 5554/udp +cvsup 5999/tcp # CVSup +cvsup 5999/udp +x11 6000/tcp # X Window System +x11 6000/udp +kftp-data 6620/tcp # Kerberos V5 FTP Data +kftp-data 6620/udp +kftp 6621/tcp # Kerberos V5 FTP Control +kftp 6621/udp +ktelnet 6623/tcp # Kerberos V5 Telnet +ktelnet 6623/udp +gnutella-svc 6346/tcp +gnutella-svc 6346/udp +gnutella-rtr 6347/tcp +gnutella-rtr 6347/udp +sane-port 6566/tcp # SANE Network Scanner Control Port +sane-port 6566/udp +parsec-game 6582/tcp # Parsec Gameserver +parsec-game 6582/udp +afs3-fileserver 7000/tcp bbs # file server itself +afs3-fileserver 7000/udp bbs +afs3-callback 7001/tcp # callbacks to cache managers +afs3-callback 7001/udp +afs3-prserver 7002/tcp # users & groups database +afs3-prserver 7002/udp +afs3-vlserver 7003/tcp # volume location database +afs3-vlserver 7003/udp +afs3-kaserver 7004/tcp # AFS/Kerberos authentication +afs3-kaserver 7004/udp +afs3-volser 7005/tcp # volume managment server +afs3-volser 7005/udp +afs3-errors 7006/tcp # error interpretation service +afs3-errors 7006/udp +afs3-bos 7007/tcp # basic overseer process +afs3-bos 7007/udp +afs3-update 7008/tcp # server-to-server updater +afs3-update 7008/udp +afs3-rmtsys 7009/tcp # remote cache manager service +afs3-rmtsys 7009/udp +font-service 7100/tcp xfs # X Font Service +font-service 7100/udp xfs +sncp 7560/tcp # Sniffer Command Protocol +sncp 7560/udp +soap-http 7627/tcp # SOAP Service Port +soap-http 7627/udp +http-alt 8008/tcp # HTTP Alternate +http-alt 8008/udp +http-alt 8080/tcp webcache # HTTP Alternate +http-alt 8080/udp webcache # WWW caching service +sunproxyadmin 8081/tcp tproxy # Sun Proxy Admin Service +sunproxyadmin 8081/udp tproxy # Transparent Proxy +pichat 9009/tcp # Pichat Server +pichat 9009/udp +bacula-dir 9101/tcp # Bacula Director +bacula-dir 9101/udp +bacula-fd 9102/tcp # Bacula File Daemon +bacula-fd 9102/udp +bacula-sd 9103/tcp # Bacula Storage Daemon +bacula-sd 9103/udp +dddp 9131/tcp # Dynamic Device Discovery +dddp 9131/udp +wap-wsp 9200/tcp # WAP connectionless session service +wap-wsp 9200/udp +wap-wsp-wtp 9201/tcp # WAP session service +wap-wsp-wtp 9201/udp +wap-wsp-s 9202/tcp # WAP secure connectionless session service +wap-wsp-s 9202/udp +wap-wsp-wtp-s 9203/tcp # WAP secure session service +wap-wsp-wtp-s 9203/udp +wap-vcard 9204/tcp # WAP vCard +wap-vcard 9204/udp +wap-vcal 9205/tcp # WAP vCal +wap-vcal 9205/udp +wap-vcard-s 9206/tcp # WAP vCard Secure +wap-vcard-s 9206/udp +wap-vcal-s 9207/tcp # WAP vCal Secure +wap-vcal-s 9207/udp +git 9418/tcp # git pack transfer service +git 9418/udp +cba8 9593/tcp # LANDesk Management Agent +cba8 9593/udp +davsrc 9800/tcp # WebDav Source Port +davsrc 9800/udp +sqlexec 9088/tcp # IBM Informix SQL Interface +sqlexec 9088/udp +sqlexec-ssl 9089/tcp # IBM Informix SQL Interface - Encrypted +sqlexec-ssl 9089/udp +sd 9876/tcp # Session Director +sd 9876/udp +cyborg-systems 9888/tcp # CYBORG Systems +cyborg-systems 9888/udp +monkeycom 9898/tcp # MonkeyCom +monkeycom 9898/udp +sctp-tunneling 9899/tcp # SCTP TUNNELING +sctp-tunneling 9899/udp +domaintime 9909/tcp # domaintime +domaintime 9909/udp +amanda 10080/tcp # amanda backup services +amanda 10080/udp +vce 11111/tcp # Viral Computing Environment (VCE) +vce 11111/udp +smsqp 11201/tcp # Alamin SMS gateway +smsqp 11201/udp +hkp 11371/tcp # OpenPGP HTTP Keyserver +hkp 11371/udp +h323callsigalt 11720/tcp # h323 Call Signal Alternate +h323callsigalt 11720/udp +rets-ssl 12109/tcp # RETS over SSL +rets-ssl 12109/udp +cawas 12168/tcp # CA Web Access Service +cawas 12168/udp +bprd 13720/tcp # BPRD Protocol (VERITAS NetBackup) +bprd 13720/udp +bpdbm 13721/tcp # BPDBM Protocol (VERITAS NetBackup) +bpdbm 13721/udp +bpjava-msvc 13722/tcp # BP Java MSVC Protocol +bpjava-msvc 13722/udp +vnetd 13724/tcp # Veritas Network Utility +vnetd 13724/udp +bpcd 13782/tcp # VERITAS NetBackup +bpcd 13782/udp +vopied 13783/tcp # VOPIED Protocol +vopied 13783/udp +xpilot 15345/tcp # XPilot Contact Port +xpilot 15345/udp +wnn6 22273/tcp # wnn6 +wnn6 22273/udp +binkp 24554/tcp # Bink fidonet protocol +binkp 24554/udp +quake 26000/tcp # Quake @!# +quake 26000/udp +wnn6-ds 26208/tcp +wnn6-ds 26208/udp +tetrinet 31457/tcp # TetriNET Protocol +tetrinet 31457/udp +gamesmith-port 31765/tcp # GameSmith Port +gamesmith-port 31765/udp +traceroute 33434/tcp # traceroute use +traceroute 33434/udp +candp 42508/tcp # Computer Associates network discovery protocol +candp 42508/udp +candrp 42509/tcp # CA discovery response +candrp 42509/udp +caerpc 42510/tcp # CA eTrust RPC +caerpc 42510/udp + +#========================================================================= +# The remaining port numbers are not as allocated by IANA. + +# Kerberos (Project Athena/MIT) services +# Note that these are for Kerberos v4, and are unofficial +kpop 1109/tcp # Pop with Kerberos +knetd 2053/tcp # Kerberos de-multiplexor +eklogin 2105/tcp # Kerberos encrypted rlogin + +# CVSup support http://www.cvsup.org/ +supfilesrv 871/tcp # SUP server +supfiledbg 1127/tcp # SUP debugging + +# Datagram Delivery Protocol services +rtmp 1/ddp # Routing Table Maintenance Protocol +nbp 2/ddp # Name Binding Protocol +echo 4/ddp # AppleTalk Echo Protocol +zip 6/ddp # Zone Information Protocol + +# Many services now accepted as 'standard' +swat 901/tcp # Samba configuration tool +rndc 953/tcp # rndc control sockets (BIND 9) +rndc 953/udp +skkserv 1178/tcp # SKK Japanese input method +xtel 1313/tcp # french minitel +support 1529/tcp # GNATS +cfinger 2003/tcp lmtp # GNU Finger +ninstall 2150/tcp # ninstall service +ninstall 2150/udp +afbackup 2988/tcp # Afbackup system +afbackup 2988/udp +fax 4557/tcp # FAX transmission service (old) +rplay 5555/tcp # RPlay audio service +rplay 5555/udp +canna 5680/tcp # Canna (Japanese Input) +x11-ssh 6010/tcp x11-ssh-offset +x11-ssh 6010/udp x11-ssh-offset +ircd 6667/tcp # Internet Relay Chat +ircd 6667/udp +jetdirect 9100/tcp # HP JetDirect card +jetdirect 9100/udp +mandelspawn 9359/udp mandelbrot # network mandelbrot +kamanda 10081/tcp # amanda backup services (Kerberos) +kamanda 10081/udp +amandaidx 10082/tcp # amanda backup services +amidxtape 10083/tcp # amanda backup services +isdnlog 20011/tcp # isdn logging system +isdnlog 20011/udp +vboxd 20012/tcp # voice box system +vboxd 20012/udp +wnn4_Cn 22289/tcp wnn6_Cn # Wnn (Chinese input) +wnn4_Kr 22305/tcp wnn6_Kr # Wnn (Korean input) +wnn4_Tw 22321/tcp wnn6_Tw # Wnn (Taiwanse input) +asp 27374/tcp # Address Search Protocol +asp 27374/udp +tfido 60177/tcp # Ifmail +tfido 60177/udp +fido 60179/tcp # Ifmail +fido 60179/udp + +# Local services + diff --git a/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch b/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch deleted file mode 100644 index 976f64bb1..000000000 --- a/main/alpine-conf/0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ab68d58344a5e5421a52dccace155b5a42be4f14 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 21 Dec 2012 15:29:06 +0100 -Subject: [PATCH] setup-interfaces: fix ip: can't find device 'eth1.3' message - -ref #1404 ---- - setup-interfaces.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/setup-interfaces.in b/setup-interfaces.in -index c4ffa47..263beec 100755 ---- a/setup-interfaces.in -+++ b/setup-interfaces.in -@@ -73,7 +73,9 @@ get_default_mask() { - } - - get_default_gateway() { -- ip route show dev $1 | awk '/^default/ {print $3}' -+ if iface_exists $1; then -+ ip route show dev $1 | awk '/^default/ {print $3}' -+ fi - } - - ipaddr_help() { --- -1.8.0.2 - diff --git a/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch b/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch deleted file mode 100644 index 39298c4f5..000000000 --- a/main/alpine-conf/0001-setup-interfaces-fix-vlan-raw-device.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8201bedeef8250452bdcdf5db0699c12b7ff7066 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 1 Mar 2013 10:54:12 +0000 -Subject: [PATCH] setup-interfaces: fix vlan-raw-device - -ref #1624 ---- - setup-interfaces.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup-interfaces.in b/setup-interfaces.in -index 263beec..54d861a 100755 ---- a/setup-interfaces.in -+++ b/setup-interfaces.in -@@ -426,7 +426,7 @@ prompt_for_interfaces() { - echo -e "\tbond-slaves $bond_slaves" >> interfaces - fi - if [ -n "$raw_device" ]; then -- echo -e "\traw-device $raw_device" >> interfaces -+ echo -e "\tvlan-raw-device $raw_device" >> interfaces - fi - case "$iface" in - *.[0-9]*|vlan[0-9]*) PKGS="$PKGS vlan";; --- -1.8.1.4 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 5e3864430..af976469c 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.12.0 -pkgrel=2 +pkgver=2.13.0 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" -source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch - 0001-setup-interfaces-fix-vlan-raw-device.patch +source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz " arch="all" @@ -38,12 +36,6 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="4038a3be9a785ead649d913e208e2bd8 alpine-conf-2.12.0.tar.bz2 -1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch -8e528859d2ea4d24e2de9436c499a64d 0001-setup-interfaces-fix-vlan-raw-device.patch" -sha256sums="d3f2a2e9a14ff2152731ed97aad9435da4be698b192400dc8dc942fc7830f0c4 alpine-conf-2.12.0.tar.bz2 -4e24ab7e3c0c851af03ea48016aeaa7e066962ceddc96cdc9cdd5566f25b2bfd 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch -591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94 0001-setup-interfaces-fix-vlan-raw-device.patch" -sha512sums="93cc71a83d9e773b92a9993003c0b8b5ed98b5ee42db74c69cde635ca9230c59be0ce99588828729ec41c1a4262bbe9fdb60a81adf282c3f063ff916666e1140 alpine-conf-2.12.0.tar.bz2 -400b527ada2dff3662a55f6046a9e2ae762e91456574ee3cb665bc2c469e1c0f29b2d9f9c1ea2e4bdf5d02554f20df0a6ebe78b06e957cce17e21233fd08a097 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch -2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf 0001-setup-interfaces-fix-vlan-raw-device.patch" +md5sums="29907dff864b4545e1fb5f49e08629bc alpine-conf-2.13.0.tar.xz" +sha256sums="907c83a8fa1027e017fc84c7ff4bea62a41e7dcd2acd3ed7fa97ee1afc8a81ad alpine-conf-2.13.0.tar.xz" +sha512sums="fb083d154cedbd9dfa5a2ab044e7ee29ecc58dfefe80bd3c1ca9eac9d080deece561cddea996278d7db42aae44fac4b00f19d32a23ec996fbf6a6c76b78b0e85 alpine-conf-2.13.0.tar.xz" diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index a31ac58c3..ab95e5cf7 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=11.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Asterisk: A Module Open Source PBX System" pkgusers="asterisk" pkggroups="asterisk" @@ -13,7 +13,8 @@ depends= makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev - libresample sqlite-dev wget speex-dev libogg-dev bluez-dev curl-dev" + libresample sqlite-dev wget speex-dev libogg-dev bluez-dev curl-dev + libedit-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc $pkgname-tds $pkgname-fax $pkgname-sample-config:sample @@ -83,6 +84,7 @@ build() { --with-spandsp \ --with-bluetooth \ --with-curl \ + --with-libedit \ || return 1 # and figure out which modules to build @@ -90,12 +92,12 @@ build() { make menuselect.makeopts # enable chan_mobile sed -i -e '/^MENUSELECT_ADDONS=/s/chan_mobile//' menuselect.makeopts - make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" || return 1 + make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" LDCONFIG_FLAGS="-n" || return 1 } package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install install -d "$pkgdir"/var/run/asterisk install -d "$pkgdir"/var/lib/asterisk diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD index 372ed1a43..965129ad5 100644 --- a/main/clamsmtp/APKBUILD +++ b/main/clamsmtp/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=clamsmtp pkgver=1.10 -pkgrel=9 +pkgrel=10 pkgdesc="An SMTP Virus Filter" -url="http://memberwebs.com/stef/software/clamsmtp/" +url="http://thewalter.net/stef/software/clamsmtp/" arch="all" license="as-is" depends= makedepends= install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade" subpackages="$pkgname-doc" -source="http://memberwebs.com/stef/software/clamsmtp/${pkgname}-${pkgver}.tar.gz +source="http://thewalter.net/stef/software/clamsmtp/clamsmtp-$pkgver.tar.gz clamsmtpd.confd clamsmtpd.initd " diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD index dfceb765b..b8c72fb4a 100644 --- a/main/cyrus-sasl/APKBUILD +++ b/main/cyrus-sasl/APKBUILD @@ -2,14 +2,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cyrus-sasl pkgver=2.1.26 -pkgrel=0 +pkgrel=1 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)" url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" arch="all" license="custom" subpackages="$pkgname-dev $pkgname-doc libsasl" depends= -makedepends="db-dev openssl-dev heimdal-dev" +makedepends="db-dev openssl-dev heimdal-dev + autoconf automake libtool" source="ftp://ftp.cyrusimap.org/$pkgname/$pkgname-$pkgver.tar.gz saslauthd.initd cyrus-sasl-2.1.26-size_t.patch @@ -23,6 +24,13 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + + # the libtool they ship is broken + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in || return 1 + rm -rf config/config.guess config/config.sub config/ltconfig \ + config/ltmain.sh config/libtool.m4 autom4te.cache + libtoolize -c && aclocal -I config -I cmulocal \ + && automake -a -c && autoheader && autoconf } build() { diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index e807e1f2d..3b68a0447 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Contributor: Cameron Banta <cbanta@gmail.com> pkgname=freeswitch -pkgver=1.2.10 +pkgver=1.4.0 pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="http://www.freeswitch.org" @@ -10,6 +10,7 @@ arch="all" license="GPL" depends="" pkgusers="freeswitch" +options="!configsub" pkggroups="freeswitch" makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev autoconf automake libtool libpri-dev bash net-snmp-dev postgresql-dev @@ -18,7 +19,7 @@ makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev ncurses-dev install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dev $pkgname-flite $pkgname-timezones $pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma" -source="http://files.freeswitch.org/$pkgname-$pkgver.tar.bz2 +source="http://files.freeswitch.org/$pkgname-$pkgver.latest.tar.bz2 freeswitch-mod_shout-textrels.patch 0002-mod_lua-alpine-module-search-path.patch modules.conf @@ -149,19 +150,19 @@ conf() { mkdir -p "$pkgdir"/etc/freeswitch/scripts } -md5sums="1da91e73cdbf1d43db73007897849cc3 freeswitch-1.2.10.tar.bz2 +md5sums="fe7156cad3b37479de8da236a2d3653a freeswitch-1.4.0.latest.tar.bz2 e3912aa52a4d8f8cb3b4e38c2668116d freeswitch-mod_shout-textrels.patch 769eaa127d4dbae687dc4aa961a8cc70 0002-mod_lua-alpine-module-search-path.patch 0eb382f73ed393f28b8a797ebbfa608b modules.conf c608cca8ad773acebf201f581438c7e7 freeswitch.confd b48a5dbaa455bbe0bba4880cc06e6ff8 freeswitch.initd" -sha256sums="a763b1407d0352a5de36f12fce6b9bb56f3430d8017b9f5c6e573579e97cda43 freeswitch-1.2.10.tar.bz2 +sha256sums="e08731d5d30e3ddde5b1d7030636c4e0d6a121f318aecf9a88274d4b6cefd75e freeswitch-1.4.0.latest.tar.bz2 ecb80df356c1a5e825eeff7327f15e6a5dd745610d6224d3785f851c30b99f15 freeswitch-mod_shout-textrels.patch ec1eb0cc516533893d56afe8ad95e7f2c886522540b7b443c6d60a05207ed081 0002-mod_lua-alpine-module-search-path.patch f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41 modules.conf 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1 freeswitch.confd 4c3d4db15afe51c6a29f13fded2821e3390dc21953fa7f9bcb238626a40d8037 freeswitch.initd" -sha512sums="5d8eb856f388bdc244aa18f4f1970043e9d236434a34477765752fcbf89d2f76e89898917212264c7b53d9f8cc7ef0b7429c304ff6289a37baa3b1a25f23f145 freeswitch-1.2.10.tar.bz2 +sha512sums="34b8038f9b42ed1b035a57c2057f34d78da31cc9ab38792fd5d7dad7eb8e1ebbca924cd487643714c4b25a1e126fe5d65147af948769e529c4f1640d90e3a490 freeswitch-1.4.0.latest.tar.bz2 082ee8e5daec0b2bbdd125f1a9270a77f244fb5b27ca816959311602acc0f68ed82bb568d7545b1da90b7a67ec444738ac70cc2a262b30d74ff5b985a0ce43ea freeswitch-mod_shout-textrels.patch 61574226372574066d7a005f68dd90ad59af7950ec689c0899affc0afcde0d7801e6b0d571af0f2911d9f2953c8b87d2473170cbea9a527f23134a33721c78b6 0002-mod_lua-alpine-module-search-path.patch 6330e47cd3dcfdb4f5c99e91c9c725c7c8aa4f1691d83817d7600e510b5a586f3312bab84df3766448bbdab78cd1feebecf64b8280626b3f751f6e787f145e23 modules.conf diff --git a/main/gcc/11_all_default-warn-format-security.patch b/main/gcc/11_all_default-warn-format-security.patch deleted file mode 100644 index 5dbab43f1..000000000 --- a/main/gcc/11_all_default-warn-format-security.patch +++ /dev/null @@ -1,49 +0,0 @@ -Enable -Wformat and -Wformat-security by default. - - ---- a/gcc/c-family/c-common.c -+++ b/gcc/c-family/c-common.c -@@ -201,7 +201,7 @@ int warn_unknown_pragmas; /* Tri state variable. */ - /* Warn about format/argument anomalies in calls to formatted I/O functions - (*printf, *scanf, strftime, strfmon, etc.). */ - --int warn_format; -+int warn_format = 1; - - /* C/ObjC language option variables. */ - ---- a/gcc/c-family/c.opt -+++ b/gcc/c-family/c.opt -@@ -384,7 +384,7 @@ C ObjC C++ ObjC++ Var(warn_format_contains_nul) Warning - Warn about format strings that contain NUL bytes - - Wformat-security --C ObjC C++ ObjC++ Var(warn_format_security) Warning -+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning - Warn about possible security problems with format functions - - Wformat-y2k ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -3111,6 +3111,9 @@ aspects of format checking, the options @option{-Wformat-y2k}, - @option{-Wformat-nonliteral}, @option{-Wformat-security}, and - @option{-Wformat=2} are available, but are not included in @option{-Wall}. - -+In Gentoo this option is enabled by default for C, C++, ObjC, ObjC++. -+To disable, use @option{-Wformat=0}. -+ - @item -Wformat-y2k - @opindex Wformat-y2k - @opindex Wno-format-y2k -@@ -3164,6 +3167,11 @@ currently a subset of what @option{-Wformat-nonliteral} warns about, but - in future warnings may be added to @option{-Wformat-security} that are not - included in @option{-Wformat-nonliteral}.) - -+In Gentoo this option is enabled by default for C, C++, ObjC, ObjC++. -+To disable, use @option{-Wno-format-security}, or disable all format warnings -+with @option{-Wformat=0}. To make format security warnings fatal, specify -+@option{-Werror=format-security}. -+ - @item -Wformat=2 - @opindex Wformat=2 - @opindex Wno-format=2 diff --git a/main/gcc/12_all_default-warn-trampolines.patch b/main/gcc/12_all_default-warn-trampolines.patch index 4b26aecd2..2fd4051b1 100644 --- a/main/gcc/12_all_default-warn-trampolines.patch +++ b/main/gcc/12_all_default-warn-trampolines.patch @@ -2,7 +2,7 @@ Enable -Wtrampolines by default. --- a/gcc/common.opt +++ b/gcc/common.opt -@@ -639,7 +639,7 @@ Common Var(warn_system_headers) Warning +@@ -640,7 +640,7 @@ Common Var(warn_system_headers) Warning Do not suppress warnings from system headers Wtrampolines @@ -13,7 +13,7 @@ Enable -Wtrampolines by default. Wtype-limits --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -3878,6 +3878,8 @@ headers---for that, @option{-Wunknown-pragmas} must also be used. +@@ -4007,6 +4007,8 @@ headers---for that, @option{-Wunknown-pragmas} must also be used. for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. diff --git a/main/gcc/15_all_libgfortran-Werror.patch b/main/gcc/15_all_libgfortran-Werror.patch new file mode 100644 index 000000000..5f15373d8 --- /dev/null +++ b/main/gcc/15_all_libgfortran-Werror.patch @@ -0,0 +1,17 @@ +libgfortran does not respect --disable-werror + +https://bugs.gentoo.org/433435 +http://gcc.gnu.org/PR54724 + + +--- a/libgfortran/configure ++++ b/libgfortran/configure +@@ -5764,7 +5764,7 @@ fi + + # Add -Wall -fno-repack-arrays -fno-underscoring if we are using GCC. + if test "x$GCC" = "xyes"; then +- AM_FCFLAGS="-I . -Wall -Werror -fimplicit-none -fno-repack-arrays -fno-underscoring" ++ AM_FCFLAGS="-I . -Wall -fimplicit-none -fno-repack-arrays -fno-underscoring" + ## We like to use C99 routines when available. This makes sure that + ## __STDC_VERSION__ is set such that libc includes make them available. + AM_CFLAGS="-std=gnu99 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wextra -Wwrite-strings" diff --git a/main/gcc/16_all_libgo-Werror-pr53679.patch b/main/gcc/16_all_libgo-Werror-pr53679.patch deleted file mode 100644 index 3c1ece364..000000000 --- a/main/gcc/16_all_libgo-Werror-pr53679.patch +++ /dev/null @@ -1,16 +0,0 @@ -libgo does not respect --disable-werror - -https://bugs.gentoo.org/423153 -http://gcc.gnu.org/PR53679 - ---- a/libgo/configure -+++ b/libgo/configure -@@ -13384,7 +13384,7 @@ done - WARN_FLAGS='-Wall -Wextra -Wwrite-strings -Wcast-qual' - - --WERROR="-Werror" -+WERROR="" - - - glibgo_toolexecdir=no diff --git a/main/gcc/15_all_libgomp-Werror.patch b/main/gcc/16_all_libgomp-Werror.patch index 3456e8ae8..d6a355d67 100644 --- a/main/gcc/15_all_libgomp-Werror.patch +++ b/main/gcc/16_all_libgomp-Werror.patch @@ -3,9 +3,10 @@ libgomp does not respect --disable-werror https://bugs.gentoo.org/229059 http://gcc.gnu.org/PR38436 + --- a/libgomp/configure +++ b/libgomp/configure -@@ -4284,7 +4284,7 @@ save_CFLAGS="$CFLAGS" +@@ -4282,7 +4282,7 @@ save_CFLAGS="$CFLAGS" # Add -Wall -Werror if we are using GCC. if test "x$GCC" = "xyes"; then diff --git a/main/gcc/29_all_arm_armv4t-default.patch b/main/gcc/29_all_arm_armv4t-default.patch deleted file mode 100644 index 4616cf9ab..000000000 --- a/main/gcc/29_all_arm_armv4t-default.patch +++ /dev/null @@ -1,16 +0,0 @@ -gcc defaults to armv5t for all targets even armv4t - -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/main/gcc/48_all_x86_pr53113_libitm-avx.patch b/main/gcc/48_all_x86_pr53113_libitm-avx.patch new file mode 100644 index 000000000..b17653023 --- /dev/null +++ b/main/gcc/48_all_x86_pr53113_libitm-avx.patch @@ -0,0 +1,28 @@ +libitm checks for AVX support in the assembler and adds -mavx to x86_avx.cc +which defines the needed typedefs. User CFLAGS can override -mavx however, +so also use the fallback typedef if __AVX__ isn't defined. + +https://bugs.gentoo.org/417271 +http://gcc.gnu.org/PR53113 + + +--- a/libitm/config/x86/x86_avx.cc ++++ b/libitm/config/x86/x86_avx.cc +@@ -29,7 +29,7 @@ + + extern "C" { + +-#ifndef HAVE_AS_AVX ++#if !defined (HAVE_AS_AVX) || !defined(__AVX__) + // If we don't have an AVX capable assembler, we didn't set -mavx on the + // command-line either, which means that libitm.h defined neither this type + // nor the functions in this file. Define the type and unconditionally +@@ -40,7 +40,7 @@ typedef float _ITM_TYPE_M256 __attribute__((vector_size(32), may_alias)); + // Re-define the memcpy implementations so that we can frob the + // interface to deal with possibly missing AVX instruction set support. + +-#ifdef HAVE_AS_AVX ++#if defined(HAVE_AS_AVX) && defined(__AVX__) + #define RETURN(X) return X + #define STORE(X,Y) X = Y + #define OUTPUT(T) _ITM_TYPE_##T diff --git a/main/gcc/49_all_gcc-4.7-x86-libitm-pr52695.patch b/main/gcc/49_all_gcc-4.7-x86-libitm-pr52695.patch deleted file mode 100644 index e1eb2e6ab..000000000 --- a/main/gcc/49_all_gcc-4.7-x86-libitm-pr52695.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://gcc.gnu.org/PR52695 -https://bugs.gentoo.org/421305 - -fix building on x86 systems - ---- a/libitm/config/x86/target.h -+++ b/libitm/config/x86/target.h -@@ -69,16 +69,4 @@ - } // namespace GTM - - // We'll be using some of the cpu builtins, and their associated types. --#ifndef __cplusplus --/* ??? It's broken for C++. */ - #include <x86intrin.h> --#else --# ifdef __SSE2__ --# include <emmintrin.h> --# elif defined(__SSE__) --# include <xmmintrin.h> --# endif --# ifdef __AVX__ --# include <immintrin.h> --# endif --#endif diff --git a/main/gcc/50_all_libiberty-asprintf.patch b/main/gcc/50_all_libiberty-asprintf.patch new file mode 100644 index 000000000..9ad4a9266 --- /dev/null +++ b/main/gcc/50_all_libiberty-asprintf.patch @@ -0,0 +1,18 @@ +2008-07-25 Magnus Granberg <zorry@ume.nu> + + * include/libiberty.h (asprintf): Don't declare if defined as a macro + +--- a/include/libiberty.h ++++ b/include/libiberty.h +@@ -609,8 +609,11 @@ extern int pwait (int, int *, int); + /* Like sprintf but provides a pointer to malloc'd storage, which must + be freed by the caller. */ + ++/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */ ++#ifndef asprintf + extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2; + #endif ++#endif + + #if !HAVE_DECL_VASPRINTF + /* Like vsprintf but provides a pointer to malloc'd storage, which diff --git a/main/gcc/67_all_gcc-poison-system-directories.patch b/main/gcc/67_all_gcc-poison-system-directories.patch index a9aee2732..72b7e0d49 100644 --- a/main/gcc/67_all_gcc-poison-system-directories.patch +++ b/main/gcc/67_all_gcc-poison-system-directories.patch @@ -29,13 +29,23 @@ Upstream-Status: Inappropriate [distribution: codesourcery] ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /usr/include, /usr/local/include or /usr/X11R6/include. -Index: gcc-4_7-branch/gcc/common.opt -=================================================================== ---- gcc-4_7-branch.orig/gcc/common.opt 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/common.opt 2012-04-10 10:56:02.259442274 -0700 -@@ -582,6 +582,10 @@ - Common Var(warn_padded) Warning - Warn when padding is required to align structure members + +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -2018,7 +2018,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ + + incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ + intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ +- $(MACHMODE_H) ++ $(MACHMODE_H) $(FLAGS_H) toplev.h + + CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) + prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \ +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -595,6 +595,10 @@ Wpedantic + Common Var(pedantic) Warning + Issue warnings needed for strict compliance to the standard +Wpoison-system-directories +Common Var(flag_poison_system_directories) Init(1) Warning @@ -44,11 +54,9 @@ Index: gcc-4_7-branch/gcc/common.opt Wshadow Common Var(warn_shadow) Warning Warn when one local variable shadows another -Index: gcc-4_7-branch/gcc/config.in -=================================================================== ---- gcc-4_7-branch.orig/gcc/config.in 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/config.in 2012-04-10 10:56:02.259442274 -0700 -@@ -144,6 +144,12 @@ +--- a/gcc/config.in ++++ b/gcc/config.in +@@ -138,6 +138,12 @@ #endif @@ -61,11 +69,48 @@ Index: gcc-4_7-branch/gcc/config.in /* Define if you want all operations on RTL (the basic data structure of the optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ -Index: gcc-4_7-branch/gcc/configure.ac -=================================================================== ---- gcc-4_7-branch.orig/gcc/configure.ac 2012-04-10 10:55:32.000000000 -0700 -+++ gcc-4_7-branch/gcc/configure.ac 2012-04-10 10:56:02.259442274 -0700 -@@ -4959,6 +4959,16 @@ +--- a/gcc/configure ++++ b/gcc/configure +@@ -917,6 +917,7 @@ with_gc + with_system_zlib + enable_maintainer_mode + enable_version_specific_runtime_libs ++enable_poison_system_directories + enable_plugin + enable_libquadmath_support + with_linker_hash_style +@@ -1630,6 +1631,8 @@ Optional Features: + --enable-version-specific-runtime-libs + specify that runtime libraries should be installed + in a compiler-specific directory ++ --enable-poison-system-directories ++ warn for use of native system header directories + --enable-plugin enable plugin support + --disable-libquadmath-support + disable libquadmath support for Fortran +@@ -27103,6 +27106,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi ++ + # Substitute configuration variables + + +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -5063,6 +5063,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) @@ -82,21 +127,19 @@ Index: gcc-4_7-branch/gcc/configure.ac # Substitute configuration variables AC_SUBST(subdirs) AC_SUBST(srcdir) -Index: gcc-4_7-branch/gcc/doc/invoke.texi -=================================================================== ---- gcc-4_7-branch.orig/gcc/doc/invoke.texi 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/doc/invoke.texi 2012-04-10 10:56:02.263442231 -0700 -@@ -260,6 +260,7 @@ +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -258,6 +258,7 @@ Objective-C and Objective-C++ Dialects}. -Woverlength-strings -Wpacked -Wpacked-bitfield-compat -Wpadded @gol -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol -Wpointer-arith -Wno-pointer-to-int-cast @gol +-Wno-poison-system-directories @gol - -Wredundant-decls @gol + -Wredundant-decls -Wno-return-local-addr @gol -Wreturn-type -Wsequence-point -Wshadow @gol - -Wsign-compare -Wsign-conversion -Wstack-protector @gol -@@ -3878,6 +3879,14 @@ - for most targets, it is made up of code and thus requires the stack - to be made executable in order for the program to work properly. + -Wsign-compare -Wsign-conversion -Wsizeof-pointer-memaccess @gol +@@ -4023,6 +4024,14 @@ should check to see whether the two values have ranges that overlap; and + this is done with the relational operators, so equality comparisons are + probably mistaken. +@item -Wno-poison-system-directories +@opindex Wno-poison-system-directories @@ -106,31 +149,34 @@ Index: gcc-4_7-branch/gcc/doc/invoke.texi +directories contain the correct headers and libraries for the target +system rather than the host. + - @item -Wfloat-equal - @opindex Wfloat-equal - @opindex Wno-float-equal -Index: gcc-4_7-branch/gcc/gcc.c -=================================================================== ---- gcc-4_7-branch.orig/gcc/gcc.c 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/gcc.c 2012-04-10 10:56:02.267442207 -0700 -@@ -673,6 +673,8 @@ - %{flto} %{flto=*} %l " LINK_PIE_SPEC \ - "%X %{o*} %{e*} %{N} %{n} %{r}\ + @item -Wtraditional @r{(C and Objective-C only)} + @opindex Wtraditional + @opindex Wno-traditional +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -740,6 +740,8 @@ proper position among the other output files. */ + "%{fuse-ld=*:-fuse-ld=%*}\ + %X %{o*} %{e*} %{N} %{n} %{r}\ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\ + %{Wno-poison-system-directories:--no-poison-system-directories}\ + %{Werror=poison-system-directories:--error-poison-system-directories}\ - %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\ + %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\ -Index: gcc-4_7-branch/gcc/incpath.c -=================================================================== ---- gcc-4_7-branch.orig/gcc/incpath.c 2012-04-10 10:54:04.000000000 -0700 -+++ gcc-4_7-branch/gcc/incpath.c 2012-04-10 10:56:02.267442207 -0700 -@@ -361,6 +361,26 @@ +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -28,6 +28,7 @@ + #include "intl.h" + #include "incpath.h" + #include "cppdefault.h" ++#include "diagnostic.h" + + /* Microsoft Windows does not natively support inodes. + VMS has non-numeric inodes. */ +@@ -382,6 +382,25 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) } fprintf (stderr, _("End of search list.\n")); } -+ +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES + if (flag_poison_system_directories) + { @@ -153,57 +199,3 @@ Index: gcc-4_7-branch/gcc/incpath.c } /* Use given -I paths for #include "..." but not #include <...>, and -Index: gcc-4_7-branch/gcc/Makefile.in -=================================================================== ---- gcc-4_7-branch.orig/gcc/Makefile.in 2012-04-10 10:54:05.000000000 -0700 -+++ gcc-4_7-branch/gcc/Makefile.in 2012-04-10 10:56:02.267442207 -0700 -@@ -2065,7 +2065,7 @@ - - incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \ - intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \ -- $(MACHMODE_H) -+ $(MACHMODE_H) $(FLAGS_H) toplev.h - - CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) - prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \ -Index: gcc-4_7-branch/gcc/configure -=================================================================== ---- gcc-4_7-branch.orig/gcc/configure 2012-04-10 10:55:32.000000000 -0700 -+++ gcc-4_7-branch/gcc/configure 2012-04-10 10:56:12.183442720 -0700 -@@ -914,6 +914,7 @@ - with_system_zlib - enable_maintainer_mode - enable_version_specific_runtime_libs -+enable_poison_system_directories - enable_plugin - enable_libquadmath_support - with_linker_hash_style -@@ -1627,6 +1628,8 @@ - --enable-version-specific-runtime-libs - specify that runtime libraries should be installed - in a compiler-specific directory -+ --enable-poison-system-directories -+ warn for use of native system header directories - --enable-plugin enable plugin support - --disable-libquadmath-support - disable libquadmath support for Fortran -@@ -27075,6 +27078,19 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi -+ - # Substitute configuration variables - - diff --git a/main/gcc/74_all_gcc47_cloog-dl.patch b/main/gcc/74_all_gcc47_cloog-dl.patch deleted file mode 100644 index ee108e33a..000000000 --- a/main/gcc/74_all_gcc47_cloog-dl.patch +++ /dev/null @@ -1,524 +0,0 @@ -2011-01-04 Jakub Jelinek <jakub@redhat.com> - - * Makefile.in (BACKENDLIBS): Link against -ldl instead of - -lcloog -lppl. - (graphite.o, graphite%.o): Force -O, remove -fkeep-inline-functions. - (GRAPHITE_CLOOG_UTIL_H, GRAPHITE_POLY_H): New. - (graphite*.o): Adjust dependencies. - * graphite-cloog-compat.h: Include <dlfcn.h>. Reference libcloog and - libppl symbols through pointers in cloog_pointers__ variable. - * graphite.c (init_cloog_pointers): New function. - (graphite_transform_loops): Call init_cloog_pointers. - * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop): Rename - stmt_for argument to stmt_fora. - * graphite-poly.h: Include graphite-cloog-util.h. - -2012-05-19 Ryan Hill <dirtyepic@gentoo.org> - - * configure.ac (DL_LIB): Check how to dlopen. - * configure: Regenerate. - * Makefile.in (BACKENDLIBS): Use DL_LIB. - - ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -963,6 +963,8 @@ GCC_PLUGIN_H = gcc-plugin.h highlev-plugin-common.h $(CONFIG_H) $(SYSTEM_H) \ - PLUGIN_H = plugin.h $(GCC_PLUGIN_H) - PLUGIN_VERSION_H = plugin-version.h configargs.h - LIBFUNCS_H = libfuncs.h $(HASHTAB_H) -+GRAPHITE_CLOOG_UTIL_H = graphite-cloog-util.h graphite-cloog-compat.h -+GRAPHITE_POLY_H = graphite-poly.h $(GRAPHITE_CLOOG_UTIL_H) - - # - # Now figure out from those variables how to compile and link. -@@ -1017,7 +1019,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) - # and the system's installed libraries. - LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) \ - $(LIBDECNUMBER) $(HOST_LIBS) --BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ -+BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),@DL_LIB@) $(PLUGINLIBS) $(HOST_LIBS) \ - $(ZLIB) - # Any system libraries needed just for GNAT. - SYSLIBS = @GNAT_LIBEXC@ -@@ -2603,40 +2605,40 @@ sese.o : sese.c sese.h $(CONFIG_H) $(SYSTEM_H) coretypes.h tree-pretty-print.h \ - $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) tree-pass.h value-prof.h - graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) \ - $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h \ -- $(DBGCNT_H) graphite-ppl.h graphite-poly.h graphite-scop-detection.h \ -+ $(DBGCNT_H) graphite-ppl.h $(GRAPHITE_POLY_H) graphite-scop-detection.h \ - graphite-clast-to-gimple.h graphite-sese-to-poly.h - graphite-blocking.o : graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \ - $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \ -- $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \ -- graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \ -+ $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h $(GRAPHITE_CLOOG_UTIL_H) \ -+ graphite-ppl.h $(GRAPHITE_POLY_H) graphite-clast-to-gimple.h \ - graphite-dependences.h graphite-cloog-compat.h - graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \ -- coretypes.h graphite-cloog-util.h graphite-cloog-compat.h -+ coretypes.h $(GRAPHITE_CLOOG_UTIL_H) graphite-cloog-compat.h - graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \ -- graphite-cloog-util.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) graphite-dependences.h \ -+ $(GRAPHITE_CLOOG_UTIL_H) - graphite-flattening.o : graphite-flattening.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-interchange.o : graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-poly.o : graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) gimple-pretty-print.h \ -- $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h graphite-poly.h \ -- graphite-dependences.h graphite-cloog-util.h -+ $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h $(GRAPHITE_POLY_H) \ -+ graphite-dependences.h $(GRAPHITE_CLOOG_UTIL_H) - graphite-ppl.o : graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ -- graphite-cloog-util.h graphite-ppl.h -+ $(GRAPHITE_CLOOG_UTIL_H) graphite-ppl.h - graphite-scop-detection.o : graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) \ -- sese.h graphite-ppl.h graphite-poly.h graphite-scop-detection.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) graphite-scop-detection.h - graphite-sese-to-poly.o : graphite-sese-to-poly.c $(CONFIG_H) \ - $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) \ -- $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h graphite-poly.h \ -+ $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h $(GRAPHITE_POLY_H) \ - graphite-sese-to-poly.h - tree-vect-loop.o: tree-vect-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \ -@@ -3455,6 +3457,15 @@ $(common_out_object_file): $(common_out_file) $(CONFIG_H) $(SYSTEM_H) \ - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ - $< $(OUTPUT_OPTION) - -+graphite%.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite%.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+graphite.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+ - # Build auxiliary files that support ecoff format. - mips-tfile: mips-tfile.o $(LIBDEPS) - $(LINKER) $(LINKERFLAGS) $(LDFLAGS) -o $@ \ ---- a/gcc/configure -+++ b/gcc/configure -@@ -602,6 +602,7 @@ ac_subst_vars='LTLIBOBJS - LIBOBJS - enable_plugin - pluginlibs -+DL_LIB - CLOOGINC - CLOOGLIBS - PPLINC -@@ -27236,6 +27237,7 @@ $as_echo "unable to check" >&6; } - fi - - # Check -ldl -+ DL_LIB= - saved_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 - $as_echo_n "checking for library containing dlopen... " >&6; } -@@ -27295,7 +27297,9 @@ fi - - if test x"$ac_cv_search_dlopen" = x"-ldl"; then - pluginlibs="$pluginlibs -ldl" -+ DL_LIB=$ac_cv_search_dlopen - fi -+ - LIBS="$saved_LIBS" - - # Check that we can build shared objects with -fPIC -shared ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5109,11 +5109,14 @@ if test x"$enable_plugin" = x"yes"; then - fi - - # Check -ldl -+ DL_LIB= - saved_LIBS="$LIBS" - AC_SEARCH_LIBS([dlopen], [dl]) - if test x"$ac_cv_search_dlopen" = x"-ldl"; then - pluginlibs="$pluginlibs -ldl" -+ DL_LIB=$ac_cv_search_dlopen - fi -+ AC_SUBST(DL_LIB) - LIBS="$saved_LIBS" - - # Check that we can build shared objects with -fPIC -shared ---- a/gcc/graphite-clast-to-gimple.c -+++ b/gcc/graphite-clast-to-gimple.c -@@ -836,7 +836,7 @@ clast_get_body_of_loop (struct clast_stmt *stmt) - from STMT_FOR. */ - - static tree --type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) -+type_for_clast_for (struct clast_for *stmt_fora, ivs_params_p ip) - { - mpz_t bound_one, bound_two; - tree lb_type, ub_type; -@@ -844,8 +844,8 @@ type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) - mpz_init (bound_one); - mpz_init (bound_two); - -- lb_type = type_for_clast_expr (stmt_for->LB, ip, bound_one, bound_two); -- ub_type = type_for_clast_expr (stmt_for->UB, ip, bound_one, bound_two); -+ lb_type = type_for_clast_expr (stmt_fora->LB, ip, bound_one, bound_two); -+ ub_type = type_for_clast_expr (stmt_fora->UB, ip, bound_one, bound_two); - - mpz_clear (bound_one); - mpz_clear (bound_two); ---- a/gcc/graphite-cloog-compat.h -+++ b/gcc/graphite-cloog-compat.h -@@ -272,4 +272,279 @@ static inline int cloog_matrix_nrows (CloogMatrix * m) - return m->NbRows; - } - #endif /* CLOOG_ORG */ -+ -+#include <dlfcn.h> -+#if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11 -+#define DYNSYMS_PPL11 -+#else -+#define DYNSYMS_PPL11 \ -+ DYNSYM (ppl_new_PIP_Problem_from_constraints); \ -+ DYNSYM (ppl_PIP_Problem_is_satisfiable); \ -+ DYNSYM (ppl_delete_PIP_Problem); -+#endif -+#define DYNSYMS \ -+ DYNSYM (cloog_block_alloc); \ -+ DYNSYM (cloog_block_list_free); \ -+ DYNSYM (cloog_block_list_malloc); \ -+ DYNSYM (cloog_clast_create); \ -+ DYNSYM (cloog_clast_free); \ -+ DYNSYM (cloog_domain_free); \ -+ DYNSYM (cloog_domain_matrix2domain); \ -+ DYNSYM (cloog_initialize); \ -+ DYNSYM (cloog_loop_malloc); \ -+ DYNSYM (cloog_matrix_alloc); \ -+ DYNSYM (cloog_matrix_copy); \ -+ DYNSYM (cloog_matrix_free); \ -+ DYNSYM (cloog_matrix_print); \ -+ DYNSYM (cloog_names_malloc); \ -+ DYNSYM (cloog_names_scalarize); \ -+ DYNSYM (cloog_options_free); \ -+ DYNSYM (cloog_options_malloc); \ -+ DYNSYM (cloog_program_dump_cloog); \ -+ DYNSYM (cloog_program_extract_scalars); \ -+ DYNSYM (cloog_program_free); \ -+ DYNSYM (cloog_program_generate); \ -+ DYNSYM (cloog_program_malloc); \ -+ DYNSYM (cloog_program_print); \ -+ DYNSYM (cloog_program_scatter); \ -+ DYNSYM (cloog_statement_alloc); \ -+ DYNSYM (cloog_domain_union); \ -+ DYNSYM (cloog_matrix_read); \ -+ DYNSYM (cloog_new_pol); \ -+ DYNSYM (cloog_vector_gcd); \ -+ DYNSYM (ppl_finalize); \ -+ DYNSYM (ppl_assign_Coefficient_from_mpz_t); \ -+ DYNSYM (ppl_assign_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (ppl_Coefficient_to_mpz_t); \ -+ DYNSYM (ppl_Constraint_coefficient); \ -+ DYNSYM (ppl_Constraint_inhomogeneous_term); \ -+ DYNSYM (ppl_Constraint_space_dimension); \ -+ DYNSYM (ppl_Constraint_System_begin); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_dereference); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_equal_test); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_increment); \ -+ DYNSYM (ppl_Constraint_System_end); \ -+ DYNSYM (ppl_Constraint_System_insert_Constraint); \ -+ DYNSYM (ppl_Constraint_System_space_dimension); \ -+ DYNSYM (ppl_Constraint_type); \ -+ DYNSYM (ppl_delete_Coefficient); \ -+ DYNSYM (ppl_delete_Constraint); \ -+ DYNSYM (ppl_delete_Constraint_System_const_iterator); \ -+ DYNSYM (ppl_delete_Linear_Expression); \ -+ DYNSYM (ppl_delete_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYM (ppl_delete_Pointset_Powerset_C_Polyhedron_iterator); \ -+ DYNSYM (ppl_delete_Polyhedron); \ -+ DYNSYM (ppl_Linear_Expression_add_to_coefficient); \ -+ DYNSYM (ppl_Linear_Expression_add_to_inhomogeneous); \ -+ DYNSYM (ppl_Linear_Expression_coefficient); \ -+ DYNSYM (ppl_Linear_Expression_inhomogeneous_term); \ -+ DYNSYM (ppl_Linear_Expression_space_dimension); \ -+ DYNSYM (ppl_new_Coefficient); \ -+ DYNSYM (ppl_new_Coefficient_from_mpz_t); \ -+ DYNSYM (ppl_new_Constraint); \ -+ DYNSYM (ppl_new_Constraint_System); \ -+ DYNSYM (ppl_new_Constraint_System_const_iterator); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_C_Polyhedron); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_space_dimension); \ -+ DYNSYM (ppl_new_C_Polyhedron_recycle_Constraint_System); \ -+ DYNSYM (ppl_new_Linear_Expression); \ -+ DYNSYM (ppl_new_Linear_Expression_from_Constraint); \ -+ DYNSYM (ppl_new_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (ppl_new_Linear_Expression_with_dimension); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_iterator); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_add_constraint); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_difference_assign); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_intersection_assign); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_is_empty); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_begin); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_end); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_increment); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_maximize); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_minimize); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_size); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_space_dimension); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign); \ -+ DYNSYM (ppl_Polyhedron_add_constraint); \ -+ DYNSYM (ppl_Polyhedron_add_constraints); \ -+ DYNSYM (ppl_Polyhedron_add_space_dimensions_and_embed); \ -+ DYNSYM (ppl_Polyhedron_get_constraints); \ -+ DYNSYM (ppl_Polyhedron_map_space_dimensions); \ -+ DYNSYM (ppl_Polyhedron_remove_space_dimensions); \ -+ DYNSYM (ppl_Polyhedron_space_dimension); \ -+ DYNSYM (ppl_subtract_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (pprint); \ -+ DYNSYM (stmt_block); \ -+ DYNSYM (stmt_for); \ -+ DYNSYM (stmt_guard); \ -+ DYNSYM (stmt_root); \ -+ DYNSYM (stmt_user); \ -+ DYNSYM (stmt_ass); \ -+ DYNSYM (ppl_delete_Constraint_System); \ -+ DYNSYM (ppl_initialize); \ -+ DYNSYM (ppl_new_Constraint_System_from_Constraint); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_Constraint_System); \ -+ DYNSYM (ppl_Polyhedron_affine_image); \ -+ DYNSYM (ppl_io_fprint_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYMS_PPL11 -+extern struct cloog_pointers_s__ -+{ -+ bool inited; -+ void *h; -+#define DYNSYM(x) __typeof (x) *p_##x -+ DYNSYMS -+#undef DYNSYM -+} cloog_pointers__; -+ -+#define cloog_block_alloc (*cloog_pointers__.p_cloog_block_alloc) -+#define cloog_block_list_free (*cloog_pointers__.p_cloog_block_list_free) -+#define cloog_block_list_malloc (*cloog_pointers__.p_cloog_block_list_malloc) -+#define cloog_clast_create (*cloog_pointers__.p_cloog_clast_create) -+#define cloog_clast_free (*cloog_pointers__.p_cloog_clast_free) -+#define cloog_domain_free (*cloog_pointers__.p_cloog_domain_free) -+#define cloog_domain_matrix2domain (*cloog_pointers__.p_cloog_domain_matrix2domain) -+#define cloog_initialize (*cloog_pointers__.p_cloog_initialize) -+#ifndef CLOOG_ORG -+#undef cloog_loop_malloc -+#define cloog_loop_malloc(STATE) (*cloog_pointers__.p_cloog_loop_malloc) () -+#else -+#define cloog_loop_malloc (*cloog_pointers__.p_cloog_loop_malloc) -+#endif -+#define cloog_matrix_alloc (*cloog_pointers__.p_cloog_matrix_alloc) -+#define cloog_matrix_copy (*cloog_pointers__.p_cloog_matrix_copy) -+#define cloog_matrix_free (*cloog_pointers__.p_cloog_matrix_free) -+#define cloog_matrix_print (*cloog_pointers__.p_cloog_matrix_print) -+#define cloog_names_malloc (*cloog_pointers__.p_cloog_names_malloc) -+#define cloog_names_scalarize (*cloog_pointers__.p_cloog_names_scalarize) -+#define cloog_options_free (*cloog_pointers__.p_cloog_options_free) -+#ifndef CLOOG_ORG -+#undef cloog_options_malloc -+#define cloog_options_malloc(STATE) (*cloog_pointers__.p_cloog_options_malloc) () -+#undef cloog_program_dump_cloog -+#define cloog_program_dump_cloog(DUMPFILE, PROGRAM, SCATTERINGLIST) \ -+ (*cloog_pointers__.p_cloog_program_dump_cloog) (DUMPFILE, PROGRAM) -+#undef cloog_program_extract_scalars -+#define cloog_program_extract_scalars(PROG, SCATT, OPT) \ -+ (*cloog_pointers__.p_cloog_program_extract_scalars) (PROG, SCATT) -+#else -+#define cloog_options_malloc (*cloog_pointers__.p_cloog_options_malloc) -+#define cloog_program_dump_cloog (*cloog_pointers__.p_cloog_program_dump_cloog) -+#define cloog_program_extract_scalars (*cloog_pointers__.p_cloog_program_extract_scalars) -+#endif -+#define cloog_program_free (*cloog_pointers__.p_cloog_program_free) -+#define cloog_program_generate (*cloog_pointers__.p_cloog_program_generate) -+#define cloog_program_malloc (*cloog_pointers__.p_cloog_program_malloc) -+#define cloog_program_print (*cloog_pointers__.p_cloog_program_print) -+#ifndef CLOOG_ORG -+#undef cloog_program_scatter -+#define cloog_program_scatter(PROG, SCATT, OPT) \ -+ (*cloog_pointers__.p_cloog_program_scatter) (PROG, SCATT) -+#undef cloog_statement_alloc -+#define cloog_statement_alloc(STATE, INDEX) \ -+ (*cloog_pointers__.p_cloog_statement_alloc) (INDEX) -+#else -+#define cloog_program_scatter (*cloog_pointers__.p_cloog_program_scatter) -+#define cloog_statement_alloc (*cloog_pointers__.p_cloog_statement_alloc) -+#endif -+#define cloog_domain_union (*cloog_pointers__.p_cloog_domain_union) -+#define cloog_matrix_read (*cloog_pointers__.p_cloog_matrix_read) -+#define cloog_new_pol (*cloog_pointers__.p_cloog_new_pol) -+#define cloog_vector_gcd (*cloog_pointers__.p_cloog_vector_gcd) -+#define ppl_finalize (*cloog_pointers__.p_ppl_finalize) -+#define ppl_assign_Coefficient_from_mpz_t (*cloog_pointers__.p_ppl_assign_Coefficient_from_mpz_t) -+#define ppl_assign_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_assign_Linear_Expression_from_Linear_Expression) -+#define ppl_Coefficient_to_mpz_t (*cloog_pointers__.p_ppl_Coefficient_to_mpz_t) -+#define ppl_Constraint_coefficient (*cloog_pointers__.p_ppl_Constraint_coefficient) -+#define ppl_Constraint_inhomogeneous_term (*cloog_pointers__.p_ppl_Constraint_inhomogeneous_term) -+#define ppl_Constraint_space_dimension (*cloog_pointers__.p_ppl_Constraint_space_dimension) -+#define ppl_Constraint_System_begin (*cloog_pointers__.p_ppl_Constraint_System_begin) -+#define ppl_Constraint_System_const_iterator_dereference (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_dereference) -+#define ppl_Constraint_System_const_iterator_equal_test (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_equal_test) -+#define ppl_Constraint_System_const_iterator_increment (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_increment) -+#define ppl_Constraint_System_end (*cloog_pointers__.p_ppl_Constraint_System_end) -+#define ppl_Constraint_System_insert_Constraint (*cloog_pointers__.p_ppl_Constraint_System_insert_Constraint) -+#define ppl_Constraint_System_space_dimension (*cloog_pointers__.p_ppl_Constraint_System_space_dimension) -+#define ppl_Constraint_type (*cloog_pointers__.p_ppl_Constraint_type) -+#define ppl_delete_Coefficient (*cloog_pointers__.p_ppl_delete_Coefficient) -+#define ppl_delete_Constraint (*cloog_pointers__.p_ppl_delete_Constraint) -+#define ppl_delete_Constraint_System_const_iterator (*cloog_pointers__.p_ppl_delete_Constraint_System_const_iterator) -+#define ppl_delete_Linear_Expression (*cloog_pointers__.p_ppl_delete_Linear_Expression) -+#define ppl_delete_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_delete_Pointset_Powerset_C_Polyhedron) -+#define ppl_delete_Pointset_Powerset_C_Polyhedron_iterator (*cloog_pointers__.p_ppl_delete_Pointset_Powerset_C_Polyhedron_iterator) -+#define ppl_delete_Polyhedron (*cloog_pointers__.p_ppl_delete_Polyhedron) -+#define ppl_Linear_Expression_add_to_coefficient (*cloog_pointers__.p_ppl_Linear_Expression_add_to_coefficient) -+#define ppl_Linear_Expression_add_to_inhomogeneous (*cloog_pointers__.p_ppl_Linear_Expression_add_to_inhomogeneous) -+#define ppl_Linear_Expression_coefficient (*cloog_pointers__.p_ppl_Linear_Expression_coefficient) -+#define ppl_Linear_Expression_inhomogeneous_term (*cloog_pointers__.p_ppl_Linear_Expression_inhomogeneous_term) -+#define ppl_Linear_Expression_space_dimension (*cloog_pointers__.p_ppl_Linear_Expression_space_dimension) -+#define ppl_new_Coefficient (*cloog_pointers__.p_ppl_new_Coefficient) -+#define ppl_new_Coefficient_from_mpz_t (*cloog_pointers__.p_ppl_new_Coefficient_from_mpz_t) -+#define ppl_new_Constraint (*cloog_pointers__.p_ppl_new_Constraint) -+#define ppl_new_Constraint_System (*cloog_pointers__.p_ppl_new_Constraint_System) -+#define ppl_new_Constraint_System_const_iterator (*cloog_pointers__.p_ppl_new_Constraint_System_const_iterator) -+#define ppl_new_C_Polyhedron_from_C_Polyhedron (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_C_Polyhedron) -+#define ppl_new_C_Polyhedron_from_space_dimension (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_space_dimension) -+#define ppl_new_C_Polyhedron_recycle_Constraint_System (*cloog_pointers__.p_ppl_new_C_Polyhedron_recycle_Constraint_System) -+#define ppl_new_Linear_Expression (*cloog_pointers__.p_ppl_new_Linear_Expression) -+#define ppl_new_Linear_Expression_from_Constraint (*cloog_pointers__.p_ppl_new_Linear_Expression_from_Constraint) -+#define ppl_new_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_new_Linear_Expression_from_Linear_Expression) -+#define ppl_new_Linear_Expression_with_dimension (*cloog_pointers__.p_ppl_new_Linear_Expression_with_dimension) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_iterator (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_iterator) -+#define ppl_Pointset_Powerset_C_Polyhedron_add_constraint (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_add_constraint) -+#define ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed) -+#define ppl_Pointset_Powerset_C_Polyhedron_difference_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_difference_assign) -+#define ppl_Pointset_Powerset_C_Polyhedron_intersection_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_intersection_assign) -+#define ppl_Pointset_Powerset_C_Polyhedron_is_empty (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_is_empty) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_begin (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_begin) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_end (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_end) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_increment (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_increment) -+#define ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions) -+#define ppl_Pointset_Powerset_C_Polyhedron_maximize (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_maximize) -+#define ppl_Pointset_Powerset_C_Polyhedron_minimize (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_minimize) -+#define ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions) -+#define ppl_Pointset_Powerset_C_Polyhedron_size (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_size) -+#define ppl_Pointset_Powerset_C_Polyhedron_space_dimension (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_space_dimension) -+#define ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign) -+#define ppl_Polyhedron_add_constraint (*cloog_pointers__.p_ppl_Polyhedron_add_constraint) -+#define ppl_Polyhedron_add_constraints (*cloog_pointers__.p_ppl_Polyhedron_add_constraints) -+#define ppl_Polyhedron_add_space_dimensions_and_embed (*cloog_pointers__.p_ppl_Polyhedron_add_space_dimensions_and_embed) -+#define ppl_Polyhedron_get_constraints (*cloog_pointers__.p_ppl_Polyhedron_get_constraints) -+#define ppl_Polyhedron_map_space_dimensions (*cloog_pointers__.p_ppl_Polyhedron_map_space_dimensions) -+#define ppl_Polyhedron_remove_space_dimensions (*cloog_pointers__.p_ppl_Polyhedron_remove_space_dimensions) -+#define ppl_Polyhedron_space_dimension (*cloog_pointers__.p_ppl_Polyhedron_space_dimension) -+#define ppl_subtract_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_subtract_Linear_Expression_from_Linear_Expression) -+#define pprint (*cloog_pointers__.p_pprint) -+#define stmt_block (*cloog_pointers__.p_stmt_block) -+#define stmt_for (*cloog_pointers__.p_stmt_for) -+#define stmt_guard (*cloog_pointers__.p_stmt_guard) -+#define stmt_root (*cloog_pointers__.p_stmt_root) -+#define stmt_user (*cloog_pointers__.p_stmt_user) -+#define stmt_ass (*cloog_pointers__.p_stmt_ass) -+#define ppl_delete_Constraint_System (*cloog_pointers__.p_ppl_delete_Constraint_System) -+#define ppl_initialize (*cloog_pointers__.p_ppl_initialize) -+#define ppl_new_Constraint_System_from_Constraint (*cloog_pointers__.p_ppl_new_Constraint_System_from_Constraint) -+#define ppl_new_C_Polyhedron_from_Constraint_System (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_Constraint_System) -+#define ppl_Polyhedron_affine_image (*cloog_pointers__.p_ppl_Polyhedron_affine_image) -+#define ppl_io_fprint_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_io_fprint_Pointset_Powerset_C_Polyhedron) -+#if !(PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11) -+#define ppl_new_PIP_Problem_from_constraints (*cloog_pointers__.p_ppl_new_PIP_Problem_from_constraints) -+#define ppl_PIP_Problem_is_satisfiable (*cloog_pointers__.p_ppl_PIP_Problem_is_satisfiable) -+#define ppl_delete_PIP_Problem (*cloog_pointers__.p_ppl_delete_PIP_Problem) -+#endif -+ -+#define cloog_finalize (*cloog_pointers__.p_ppl_finalize) -+ -+ - #endif /* GRAPHITE_CLOOG_COMPAT_H */ ---- a/gcc/graphite-poly.h -+++ b/gcc/graphite-poly.h -@@ -22,6 +22,8 @@ along with GCC; see the file COPYING3. If not see - #ifndef GCC_GRAPHITE_POLY_H - #define GCC_GRAPHITE_POLY_H - -+#include "graphite-cloog-util.h" -+ - typedef struct poly_dr *poly_dr_p; - DEF_VEC_P(poly_dr_p); - DEF_VEC_ALLOC_P (poly_dr_p, heap); ---- a/gcc/graphite.c -+++ b/gcc/graphite.c -@@ -56,6 +56,35 @@ along with GCC; see the file COPYING3. If not see - - CloogState *cloog_state; - -+__typeof (cloog_pointers__) cloog_pointers__; -+ -+static bool -+init_cloog_pointers (void) -+{ -+ void *h; -+ -+ if (cloog_pointers__.inited) -+ return cloog_pointers__.h != NULL; -+ h = dlopen ("libcloog.so.0", RTLD_LAZY); -+ cloog_pointers__.h = h; -+ if (h == NULL) -+ return false; -+#define DYNSYM(x) \ -+ do \ -+ { \ -+ union { __typeof (cloog_pointers__.p_##x) p; void *q; } u; \ -+ u.q = dlsym (h, #x); \ -+ if (u.q == NULL) \ -+ return false; \ -+ cloog_pointers__.p_##x = u.p; \ -+ } \ -+ while (0) -+ DYNSYMS -+#undef DYNSYM -+ return true; -+} -+ -+ - /* Print global statistics to FILE. */ - - static void -@@ -201,6 +230,12 @@ graphite_initialize (void) - return false; - } - -+ if (!init_cloog_pointers ()) -+ { -+ sorry ("Graphite loop optimizations cannot be used"); -+ return false; -+ } -+ - scev_reset (); - recompute_all_dominators (); - initialize_original_copy_tables (); diff --git a/main/gcc/74_all_gcc48_cloog-dl.patch b/main/gcc/74_all_gcc48_cloog-dl.patch new file mode 100644 index 000000000..0fb55b0ad --- /dev/null +++ b/main/gcc/74_all_gcc48_cloog-dl.patch @@ -0,0 +1,537 @@ +dlopen cloog-isl library rather than link to it directly. This prevents +cloog upgrades that change the soname from breaking the compiler. + +http://pkgs.fedoraproject.org/cgit/gcc.git/tree/gcc48-cloog-dl.patch + + +In FreeBSD dlopen is part of libc so we can't just hardcode -ldl. + +2013-03-30 Ryan Hill <dirtyepic@gentoo.org> + + * configure.ac (DL_LIB): Check how to dlopen. + * configure: Regenerate. + * Makefile.in (BACKENDLIBS): Use DL_LIB. + + +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -1020,7 +1020,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) + # and the system's installed libraries. + LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \ + $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS) +-BACKENDLIBS = $(CLOOGLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ ++BACKENDLIBS = $(if $(CLOOGLIBS),@DL_LIB@) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ + $(ZLIB) + # Any system libraries needed just for GNAT. + SYSLIBS = @GNAT_LIBEXC@ +@@ -3443,6 +3443,15 @@ $(common_out_object_file): $(common_out_file) $(CONFIG_H) $(SYSTEM_H) \ + $(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(OPTS_H) $(TM_H) $(TM_P_H) $(MACHMODE_H) + $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ + $< $(OUTPUT_OPTION) ++ ++graphite%.o : \ ++ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) ++graphite.o : \ ++ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) ++graphite%.o : \ ++ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) ++graphite.o : \ ++ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) + # + # Generate header and source files from the machine description, + # and compile them. +--- a/gcc/configure ++++ b/gcc/configure +@@ -602,6 +602,7 @@ ac_subst_vars='LTLIBOBJS + LIBOBJS + enable_plugin + pluginlibs ++DL_LIB + CLOOGINC + CLOOGLIBS + ISLINC +@@ -27263,6 +27264,7 @@ $as_echo "unable to check" >&6; } + fi + + # Check -ldl ++ DL_LIB= + saved_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 + $as_echo_n "checking for library containing dlopen... " >&6; } +@@ -27322,9 +27324,11 @@ fi + + if test x"$ac_cv_search_dlopen" = x"-ldl"; then + pluginlibs="$pluginlibs -ldl" ++ DL_LIB=$ac_cv_search_dlopen + fi + LIBS="$saved_LIBS" + ++ + # Check that we can build shared objects with -fPIC -shared + saved_LDFLAGS="$LDFLAGS" + saved_CFLAGS="$CFLAGS" +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -5212,12 +5212,15 @@ if test x"$enable_plugin" = x"yes"; then + fi + + # Check -ldl ++ DL_LIB= + saved_LIBS="$LIBS" + AC_SEARCH_LIBS([dlopen], [dl]) + if test x"$ac_cv_search_dlopen" = x"-ldl"; then + pluginlibs="$pluginlibs -ldl" ++ DL_LIB=$ac_cv_search_dlopen + fi + LIBS="$saved_LIBS" ++ AC_SUBST(DL_LIB) + + # Check that we can build shared objects with -fPIC -shared + saved_LDFLAGS="$LDFLAGS" +--- a/gcc/graphite-clast-to-gimple.c ++++ b/gcc/graphite-clast-to-gimple.c +@@ -910,7 +910,7 @@ compute_bounds_for_loop (struct clast_for *loop, mpz_t low, mpz_t up) + from STMT_FOR. */ + + static tree +-type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) ++type_for_clast_for (struct clast_for *stmt_fora, ivs_params_p ip) + { + mpz_t bound_one, bound_two; + tree lb_type, ub_type; +@@ -918,8 +918,8 @@ type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) + mpz_init (bound_one); + mpz_init (bound_two); + +- lb_type = type_for_clast_expr (stmt_for->LB, ip, bound_one, bound_two); +- ub_type = type_for_clast_expr (stmt_for->UB, ip, bound_one, bound_two); ++ lb_type = type_for_clast_expr (stmt_fora->LB, ip, bound_one, bound_two); ++ ub_type = type_for_clast_expr (stmt_fora->UB, ip, bound_one, bound_two); + + mpz_clear (bound_one); + mpz_clear (bound_two); +--- a/gcc/graphite-poly.h ++++ b/gcc/graphite-poly.h +@@ -22,6 +22,369 @@ along with GCC; see the file COPYING3. If not see + #ifndef GCC_GRAPHITE_POLY_H + #define GCC_GRAPHITE_POLY_H + ++#include <isl/aff.h> ++#include <isl/schedule.h> ++#include <isl/ilp.h> ++#include <isl/flow.h> ++#include <isl/options.h> ++#include <cloog/isl/cloog.h> ++#include <dlfcn.h> ++#define DYNSYMS \ ++ DYNSYM (clast_pprint); \ ++ DYNSYM (cloog_clast_create_from_input); \ ++ DYNSYM (cloog_clast_free); \ ++ DYNSYM (cloog_domain_from_isl_set); \ ++ DYNSYM (cloog_input_alloc); \ ++ DYNSYM (cloog_isl_state_malloc); \ ++ DYNSYM (cloog_options_free); \ ++ DYNSYM (cloog_options_malloc); \ ++ DYNSYM (cloog_scattering_from_isl_map); \ ++ DYNSYM (cloog_state_free); \ ++ DYNSYM (cloog_union_domain_add_domain); \ ++ DYNSYM (cloog_union_domain_alloc); \ ++ DYNSYM (cloog_union_domain_set_name); \ ++ DYNSYM (isl_aff_add_coefficient_si); \ ++ DYNSYM (isl_aff_add_constant); \ ++ DYNSYM (isl_aff_free); \ ++ DYNSYM (isl_aff_get_coefficient); \ ++ DYNSYM (isl_aff_get_space); \ ++ DYNSYM (isl_aff_mod); \ ++ DYNSYM (isl_aff_set_coefficient_si); \ ++ DYNSYM (isl_aff_set_constant_si); \ ++ DYNSYM (isl_aff_zero_on_domain); \ ++ DYNSYM (isl_band_free); \ ++ DYNSYM (isl_band_get_children); \ ++ DYNSYM (isl_band_get_partial_schedule); \ ++ DYNSYM (isl_band_has_children); \ ++ DYNSYM (isl_band_list_free); \ ++ DYNSYM (isl_band_list_get_band); \ ++ DYNSYM (isl_band_list_get_ctx); \ ++ DYNSYM (isl_band_list_n_band); \ ++ DYNSYM (isl_band_member_is_zero_distance); \ ++ DYNSYM (isl_band_n_member); \ ++ DYNSYM (isl_basic_map_add_constraint); \ ++ DYNSYM (isl_basic_map_project_out); \ ++ DYNSYM (isl_basic_map_universe); \ ++ DYNSYM (isl_constraint_set_coefficient); \ ++ DYNSYM (isl_constraint_set_coefficient_si); \ ++ DYNSYM (isl_constraint_set_constant); \ ++ DYNSYM (isl_constraint_set_constant_si); \ ++ DYNSYM (isl_ctx_alloc); \ ++ DYNSYM (isl_ctx_free); \ ++ DYNSYM (isl_equality_alloc); \ ++ DYNSYM (isl_id_alloc); \ ++ DYNSYM (isl_id_copy); \ ++ DYNSYM (isl_id_free); \ ++ DYNSYM (isl_inequality_alloc); \ ++ DYNSYM (isl_local_space_copy); \ ++ DYNSYM (isl_local_space_free); \ ++ DYNSYM (isl_local_space_from_space); \ ++ DYNSYM (isl_local_space_range); \ ++ DYNSYM (isl_map_add_constraint); \ ++ DYNSYM (isl_map_add_dims); \ ++ DYNSYM (isl_map_align_params); \ ++ DYNSYM (isl_map_apply_range); \ ++ DYNSYM (isl_map_copy); \ ++ DYNSYM (isl_map_dim); \ ++ DYNSYM (isl_map_dump); \ ++ DYNSYM (isl_map_equate); \ ++ DYNSYM (isl_map_fix_si); \ ++ DYNSYM (isl_map_flat_product); \ ++ DYNSYM (isl_map_flat_range_product); \ ++ DYNSYM (isl_map_free); \ ++ DYNSYM (isl_map_from_basic_map); \ ++ DYNSYM (isl_map_from_pw_aff); \ ++ DYNSYM (isl_map_from_union_map); \ ++ DYNSYM (isl_map_get_ctx); \ ++ DYNSYM (isl_map_get_space); \ ++ DYNSYM (isl_map_get_tuple_id); \ ++ DYNSYM (isl_map_insert_dims); \ ++ DYNSYM (isl_map_intersect); \ ++ DYNSYM (isl_map_intersect_domain); \ ++ DYNSYM (isl_map_intersect_range); \ ++ DYNSYM (isl_map_is_empty); \ ++ DYNSYM (isl_map_lex_ge); \ ++ DYNSYM (isl_map_lex_le); \ ++ DYNSYM (isl_map_n_out); \ ++ DYNSYM (isl_map_range); \ ++ DYNSYM (isl_map_set_tuple_id); \ ++ DYNSYM (isl_map_universe); \ ++ DYNSYM (isl_options_set_on_error); \ ++ DYNSYM (isl_options_set_schedule_fuse); \ ++ DYNSYM (isl_options_set_schedule_max_constant_term); \ ++ DYNSYM (isl_options_set_schedule_maximize_band_depth); \ ++ DYNSYM (isl_printer_free); \ ++ DYNSYM (isl_printer_print_aff); \ ++ DYNSYM (isl_printer_print_constraint); \ ++ DYNSYM (isl_printer_print_map); \ ++ DYNSYM (isl_printer_print_set); \ ++ DYNSYM (isl_printer_to_file); \ ++ DYNSYM (isl_pw_aff_add); \ ++ DYNSYM (isl_pw_aff_alloc); \ ++ DYNSYM (isl_pw_aff_copy); \ ++ DYNSYM (isl_pw_aff_eq_set); \ ++ DYNSYM (isl_pw_aff_free); \ ++ DYNSYM (isl_pw_aff_from_aff); \ ++ DYNSYM (isl_pw_aff_ge_set); \ ++ DYNSYM (isl_pw_aff_gt_set); \ ++ DYNSYM (isl_pw_aff_is_cst); \ ++ DYNSYM (isl_pw_aff_le_set); \ ++ DYNSYM (isl_pw_aff_lt_set); \ ++ DYNSYM (isl_pw_aff_mod); \ ++ DYNSYM (isl_pw_aff_mul); \ ++ DYNSYM (isl_pw_aff_ne_set); \ ++ DYNSYM (isl_pw_aff_nonneg_set); \ ++ DYNSYM (isl_pw_aff_set_tuple_id); \ ++ DYNSYM (isl_pw_aff_sub); \ ++ DYNSYM (isl_pw_aff_zero_set); \ ++ DYNSYM (isl_schedule_free); \ ++ DYNSYM (isl_schedule_get_band_forest); \ ++ DYNSYM (isl_set_add_constraint); \ ++ DYNSYM (isl_set_add_dims); \ ++ DYNSYM (isl_set_apply); \ ++ DYNSYM (isl_set_coalesce); \ ++ DYNSYM (isl_set_copy); \ ++ DYNSYM (isl_set_dim); \ ++ DYNSYM (isl_set_fix_si); \ ++ DYNSYM (isl_set_free); \ ++ DYNSYM (isl_set_from_cloog_domain); \ ++ DYNSYM (isl_set_get_space); \ ++ DYNSYM (isl_set_get_tuple_id); \ ++ DYNSYM (isl_set_intersect); \ ++ DYNSYM (isl_set_is_empty); \ ++ DYNSYM (isl_set_max); \ ++ DYNSYM (isl_set_min); \ ++ DYNSYM (isl_set_nat_universe); \ ++ DYNSYM (isl_set_project_out); \ ++ DYNSYM (isl_set_set_tuple_id); \ ++ DYNSYM (isl_set_universe); \ ++ DYNSYM (isl_space_add_dims); \ ++ DYNSYM (isl_space_alloc); \ ++ DYNSYM (isl_space_copy); \ ++ DYNSYM (isl_space_dim); \ ++ DYNSYM (isl_space_domain); \ ++ DYNSYM (isl_space_find_dim_by_id); \ ++ DYNSYM (isl_space_free); \ ++ DYNSYM (isl_space_from_domain); \ ++ DYNSYM (isl_space_get_tuple_id); \ ++ DYNSYM (isl_space_params_alloc); \ ++ DYNSYM (isl_space_range); \ ++ DYNSYM (isl_space_set_alloc); \ ++ DYNSYM (isl_space_set_dim_id); \ ++ DYNSYM (isl_space_set_tuple_id); \ ++ DYNSYM (isl_union_map_add_map); \ ++ DYNSYM (isl_union_map_align_params); \ ++ DYNSYM (isl_union_map_apply_domain); \ ++ DYNSYM (isl_union_map_apply_range); \ ++ DYNSYM (isl_union_map_compute_flow); \ ++ DYNSYM (isl_union_map_copy); \ ++ DYNSYM (isl_union_map_empty); \ ++ DYNSYM (isl_union_map_flat_range_product); \ ++ DYNSYM (isl_union_map_foreach_map); \ ++ DYNSYM (isl_union_map_free); \ ++ DYNSYM (isl_union_map_from_map); \ ++ DYNSYM (isl_union_map_get_ctx); \ ++ DYNSYM (isl_union_map_get_space); \ ++ DYNSYM (isl_union_map_gist_domain); \ ++ DYNSYM (isl_union_map_gist_range); \ ++ DYNSYM (isl_union_map_intersect_domain); \ ++ DYNSYM (isl_union_map_is_empty); \ ++ DYNSYM (isl_union_map_subtract); \ ++ DYNSYM (isl_union_map_union); \ ++ DYNSYM (isl_union_set_add_set); \ ++ DYNSYM (isl_union_set_compute_schedule); \ ++ DYNSYM (isl_union_set_copy); \ ++ DYNSYM (isl_union_set_empty); \ ++ DYNSYM (isl_union_set_from_set); \ ++ DYNSYM (stmt_ass); \ ++ DYNSYM (stmt_block); \ ++ DYNSYM (stmt_for); \ ++ DYNSYM (stmt_guard); \ ++ DYNSYM (stmt_root); \ ++ DYNSYM (stmt_user); ++extern struct cloog_pointers_s__ ++{ ++ bool inited; ++ void *h; ++#define DYNSYM(x) __typeof (x) *p_##x ++ DYNSYMS ++#undef DYNSYM ++} cloog_pointers__; ++ ++#define cloog_block_alloc (*cloog_pointers__.p_cloog_block_alloc) ++#define clast_pprint (*cloog_pointers__.p_clast_pprint) ++#define cloog_clast_create_from_input (*cloog_pointers__.p_cloog_clast_create_from_input) ++#define cloog_clast_free (*cloog_pointers__.p_cloog_clast_free) ++#define cloog_domain_from_isl_set (*cloog_pointers__.p_cloog_domain_from_isl_set) ++#define cloog_input_alloc (*cloog_pointers__.p_cloog_input_alloc) ++#define cloog_isl_state_malloc (*cloog_pointers__.p_cloog_isl_state_malloc) ++#define cloog_options_free (*cloog_pointers__.p_cloog_options_free) ++#define cloog_options_malloc (*cloog_pointers__.p_cloog_options_malloc) ++#define cloog_scattering_from_isl_map (*cloog_pointers__.p_cloog_scattering_from_isl_map) ++#define cloog_state_free (*cloog_pointers__.p_cloog_state_free) ++#define cloog_union_domain_add_domain (*cloog_pointers__.p_cloog_union_domain_add_domain) ++#define cloog_union_domain_alloc (*cloog_pointers__.p_cloog_union_domain_alloc) ++#define cloog_union_domain_set_name (*cloog_pointers__.p_cloog_union_domain_set_name) ++#define isl_aff_add_coefficient_si (*cloog_pointers__.p_isl_aff_add_coefficient_si) ++#define isl_aff_add_constant (*cloog_pointers__.p_isl_aff_add_constant) ++#define isl_aff_free (*cloog_pointers__.p_isl_aff_free) ++#define isl_aff_get_coefficient (*cloog_pointers__.p_isl_aff_get_coefficient) ++#define isl_aff_get_space (*cloog_pointers__.p_isl_aff_get_space) ++#define isl_aff_mod (*cloog_pointers__.p_isl_aff_mod) ++#define isl_aff_set_coefficient_si (*cloog_pointers__.p_isl_aff_set_coefficient_si) ++#define isl_aff_set_constant_si (*cloog_pointers__.p_isl_aff_set_constant_si) ++#define isl_aff_zero_on_domain (*cloog_pointers__.p_isl_aff_zero_on_domain) ++#define isl_band_free (*cloog_pointers__.p_isl_band_free) ++#define isl_band_get_children (*cloog_pointers__.p_isl_band_get_children) ++#define isl_band_get_partial_schedule (*cloog_pointers__.p_isl_band_get_partial_schedule) ++#define isl_band_has_children (*cloog_pointers__.p_isl_band_has_children) ++#define isl_band_list_free (*cloog_pointers__.p_isl_band_list_free) ++#define isl_band_list_get_band (*cloog_pointers__.p_isl_band_list_get_band) ++#define isl_band_list_get_ctx (*cloog_pointers__.p_isl_band_list_get_ctx) ++#define isl_band_list_n_band (*cloog_pointers__.p_isl_band_list_n_band) ++#define isl_band_member_is_zero_distance (*cloog_pointers__.p_isl_band_member_is_zero_distance) ++#define isl_band_n_member (*cloog_pointers__.p_isl_band_n_member) ++#define isl_basic_map_add_constraint (*cloog_pointers__.p_isl_basic_map_add_constraint) ++#define isl_basic_map_project_out (*cloog_pointers__.p_isl_basic_map_project_out) ++#define isl_basic_map_universe (*cloog_pointers__.p_isl_basic_map_universe) ++#define isl_constraint_set_coefficient (*cloog_pointers__.p_isl_constraint_set_coefficient) ++#define isl_constraint_set_coefficient_si (*cloog_pointers__.p_isl_constraint_set_coefficient_si) ++#define isl_constraint_set_constant (*cloog_pointers__.p_isl_constraint_set_constant) ++#define isl_constraint_set_constant_si (*cloog_pointers__.p_isl_constraint_set_constant_si) ++#define isl_ctx_alloc (*cloog_pointers__.p_isl_ctx_alloc) ++#define isl_ctx_free (*cloog_pointers__.p_isl_ctx_free) ++#define isl_equality_alloc (*cloog_pointers__.p_isl_equality_alloc) ++#define isl_id_alloc (*cloog_pointers__.p_isl_id_alloc) ++#define isl_id_copy (*cloog_pointers__.p_isl_id_copy) ++#define isl_id_free (*cloog_pointers__.p_isl_id_free) ++#define isl_inequality_alloc (*cloog_pointers__.p_isl_inequality_alloc) ++#define isl_local_space_copy (*cloog_pointers__.p_isl_local_space_copy) ++#define isl_local_space_free (*cloog_pointers__.p_isl_local_space_free) ++#define isl_local_space_from_space (*cloog_pointers__.p_isl_local_space_from_space) ++#define isl_local_space_range (*cloog_pointers__.p_isl_local_space_range) ++#define isl_map_add_constraint (*cloog_pointers__.p_isl_map_add_constraint) ++#define isl_map_add_dims (*cloog_pointers__.p_isl_map_add_dims) ++#define isl_map_align_params (*cloog_pointers__.p_isl_map_align_params) ++#define isl_map_apply_range (*cloog_pointers__.p_isl_map_apply_range) ++#define isl_map_copy (*cloog_pointers__.p_isl_map_copy) ++#define isl_map_dim (*cloog_pointers__.p_isl_map_dim) ++#define isl_map_dump (*cloog_pointers__.p_isl_map_dump) ++#define isl_map_equate (*cloog_pointers__.p_isl_map_equate) ++#define isl_map_fix_si (*cloog_pointers__.p_isl_map_fix_si) ++#define isl_map_flat_product (*cloog_pointers__.p_isl_map_flat_product) ++#define isl_map_flat_range_product (*cloog_pointers__.p_isl_map_flat_range_product) ++#define isl_map_free (*cloog_pointers__.p_isl_map_free) ++#define isl_map_from_basic_map (*cloog_pointers__.p_isl_map_from_basic_map) ++#define isl_map_from_pw_aff (*cloog_pointers__.p_isl_map_from_pw_aff) ++#define isl_map_from_union_map (*cloog_pointers__.p_isl_map_from_union_map) ++#define isl_map_get_ctx (*cloog_pointers__.p_isl_map_get_ctx) ++#define isl_map_get_space (*cloog_pointers__.p_isl_map_get_space) ++#define isl_map_get_tuple_id (*cloog_pointers__.p_isl_map_get_tuple_id) ++#define isl_map_insert_dims (*cloog_pointers__.p_isl_map_insert_dims) ++#define isl_map_intersect (*cloog_pointers__.p_isl_map_intersect) ++#define isl_map_intersect_domain (*cloog_pointers__.p_isl_map_intersect_domain) ++#define isl_map_intersect_range (*cloog_pointers__.p_isl_map_intersect_range) ++#define isl_map_is_empty (*cloog_pointers__.p_isl_map_is_empty) ++#define isl_map_lex_ge (*cloog_pointers__.p_isl_map_lex_ge) ++#define isl_map_lex_le (*cloog_pointers__.p_isl_map_lex_le) ++#define isl_map_n_out (*cloog_pointers__.p_isl_map_n_out) ++#define isl_map_range (*cloog_pointers__.p_isl_map_range) ++#define isl_map_set_tuple_id (*cloog_pointers__.p_isl_map_set_tuple_id) ++#define isl_map_universe (*cloog_pointers__.p_isl_map_universe) ++#define isl_options_set_on_error (*cloog_pointers__.p_isl_options_set_on_error) ++#define isl_options_set_schedule_fuse (*cloog_pointers__.p_isl_options_set_schedule_fuse) ++#define isl_options_set_schedule_max_constant_term (*cloog_pointers__.p_isl_options_set_schedule_max_constant_term) ++#define isl_options_set_schedule_maximize_band_depth (*cloog_pointers__.p_isl_options_set_schedule_maximize_band_depth) ++#define isl_printer_free (*cloog_pointers__.p_isl_printer_free) ++#define isl_printer_print_aff (*cloog_pointers__.p_isl_printer_print_aff) ++#define isl_printer_print_constraint (*cloog_pointers__.p_isl_printer_print_constraint) ++#define isl_printer_print_map (*cloog_pointers__.p_isl_printer_print_map) ++#define isl_printer_print_set (*cloog_pointers__.p_isl_printer_print_set) ++#define isl_printer_to_file (*cloog_pointers__.p_isl_printer_to_file) ++#define isl_pw_aff_add (*cloog_pointers__.p_isl_pw_aff_add) ++#define isl_pw_aff_alloc (*cloog_pointers__.p_isl_pw_aff_alloc) ++#define isl_pw_aff_copy (*cloog_pointers__.p_isl_pw_aff_copy) ++#define isl_pw_aff_eq_set (*cloog_pointers__.p_isl_pw_aff_eq_set) ++#define isl_pw_aff_free (*cloog_pointers__.p_isl_pw_aff_free) ++#define isl_pw_aff_from_aff (*cloog_pointers__.p_isl_pw_aff_from_aff) ++#define isl_pw_aff_ge_set (*cloog_pointers__.p_isl_pw_aff_ge_set) ++#define isl_pw_aff_gt_set (*cloog_pointers__.p_isl_pw_aff_gt_set) ++#define isl_pw_aff_is_cst (*cloog_pointers__.p_isl_pw_aff_is_cst) ++#define isl_pw_aff_le_set (*cloog_pointers__.p_isl_pw_aff_le_set) ++#define isl_pw_aff_lt_set (*cloog_pointers__.p_isl_pw_aff_lt_set) ++#define isl_pw_aff_mod (*cloog_pointers__.p_isl_pw_aff_mod) ++#define isl_pw_aff_mul (*cloog_pointers__.p_isl_pw_aff_mul) ++#define isl_pw_aff_ne_set (*cloog_pointers__.p_isl_pw_aff_ne_set) ++#define isl_pw_aff_nonneg_set (*cloog_pointers__.p_isl_pw_aff_nonneg_set) ++#define isl_pw_aff_set_tuple_id (*cloog_pointers__.p_isl_pw_aff_set_tuple_id) ++#define isl_pw_aff_sub (*cloog_pointers__.p_isl_pw_aff_sub) ++#define isl_pw_aff_zero_set (*cloog_pointers__.p_isl_pw_aff_zero_set) ++#define isl_schedule_free (*cloog_pointers__.p_isl_schedule_free) ++#define isl_schedule_get_band_forest (*cloog_pointers__.p_isl_schedule_get_band_forest) ++#define isl_set_add_constraint (*cloog_pointers__.p_isl_set_add_constraint) ++#define isl_set_add_dims (*cloog_pointers__.p_isl_set_add_dims) ++#define isl_set_apply (*cloog_pointers__.p_isl_set_apply) ++#define isl_set_coalesce (*cloog_pointers__.p_isl_set_coalesce) ++#define isl_set_copy (*cloog_pointers__.p_isl_set_copy) ++#define isl_set_dim (*cloog_pointers__.p_isl_set_dim) ++#define isl_set_fix_si (*cloog_pointers__.p_isl_set_fix_si) ++#define isl_set_free (*cloog_pointers__.p_isl_set_free) ++#define isl_set_from_cloog_domain (*cloog_pointers__.p_isl_set_from_cloog_domain) ++#define isl_set_get_space (*cloog_pointers__.p_isl_set_get_space) ++#define isl_set_get_tuple_id (*cloog_pointers__.p_isl_set_get_tuple_id) ++#define isl_set_intersect (*cloog_pointers__.p_isl_set_intersect) ++#define isl_set_is_empty (*cloog_pointers__.p_isl_set_is_empty) ++#define isl_set_max (*cloog_pointers__.p_isl_set_max) ++#define isl_set_min (*cloog_pointers__.p_isl_set_min) ++#define isl_set_nat_universe (*cloog_pointers__.p_isl_set_nat_universe) ++#define isl_set_project_out (*cloog_pointers__.p_isl_set_project_out) ++#define isl_set_set_tuple_id (*cloog_pointers__.p_isl_set_set_tuple_id) ++#define isl_set_universe (*cloog_pointers__.p_isl_set_universe) ++#define isl_space_add_dims (*cloog_pointers__.p_isl_space_add_dims) ++#define isl_space_alloc (*cloog_pointers__.p_isl_space_alloc) ++#define isl_space_copy (*cloog_pointers__.p_isl_space_copy) ++#define isl_space_dim (*cloog_pointers__.p_isl_space_dim) ++#define isl_space_domain (*cloog_pointers__.p_isl_space_domain) ++#define isl_space_find_dim_by_id (*cloog_pointers__.p_isl_space_find_dim_by_id) ++#define isl_space_free (*cloog_pointers__.p_isl_space_free) ++#define isl_space_from_domain (*cloog_pointers__.p_isl_space_from_domain) ++#define isl_space_get_tuple_id (*cloog_pointers__.p_isl_space_get_tuple_id) ++#define isl_space_params_alloc (*cloog_pointers__.p_isl_space_params_alloc) ++#define isl_space_range (*cloog_pointers__.p_isl_space_range) ++#define isl_space_set_alloc (*cloog_pointers__.p_isl_space_set_alloc) ++#define isl_space_set_dim_id (*cloog_pointers__.p_isl_space_set_dim_id) ++#define isl_space_set_tuple_id (*cloog_pointers__.p_isl_space_set_tuple_id) ++#define isl_union_map_add_map (*cloog_pointers__.p_isl_union_map_add_map) ++#define isl_union_map_align_params (*cloog_pointers__.p_isl_union_map_align_params) ++#define isl_union_map_apply_domain (*cloog_pointers__.p_isl_union_map_apply_domain) ++#define isl_union_map_apply_range (*cloog_pointers__.p_isl_union_map_apply_range) ++#define isl_union_map_compute_flow (*cloog_pointers__.p_isl_union_map_compute_flow) ++#define isl_union_map_copy (*cloog_pointers__.p_isl_union_map_copy) ++#define isl_union_map_empty (*cloog_pointers__.p_isl_union_map_empty) ++#define isl_union_map_flat_range_product (*cloog_pointers__.p_isl_union_map_flat_range_product) ++#define isl_union_map_foreach_map (*cloog_pointers__.p_isl_union_map_foreach_map) ++#define isl_union_map_free (*cloog_pointers__.p_isl_union_map_free) ++#define isl_union_map_from_map (*cloog_pointers__.p_isl_union_map_from_map) ++#define isl_union_map_get_ctx (*cloog_pointers__.p_isl_union_map_get_ctx) ++#define isl_union_map_get_space (*cloog_pointers__.p_isl_union_map_get_space) ++#define isl_union_map_gist_domain (*cloog_pointers__.p_isl_union_map_gist_domain) ++#define isl_union_map_gist_range (*cloog_pointers__.p_isl_union_map_gist_range) ++#define isl_union_map_intersect_domain (*cloog_pointers__.p_isl_union_map_intersect_domain) ++#define isl_union_map_is_empty (*cloog_pointers__.p_isl_union_map_is_empty) ++#define isl_union_map_subtract (*cloog_pointers__.p_isl_union_map_subtract) ++#define isl_union_map_union (*cloog_pointers__.p_isl_union_map_union) ++#define isl_union_set_add_set (*cloog_pointers__.p_isl_union_set_add_set) ++#define isl_union_set_compute_schedule (*cloog_pointers__.p_isl_union_set_compute_schedule) ++#define isl_union_set_copy (*cloog_pointers__.p_isl_union_set_copy) ++#define isl_union_set_empty (*cloog_pointers__.p_isl_union_set_empty) ++#define isl_union_set_from_set (*cloog_pointers__.p_isl_union_set_from_set) ++#define stmt_ass (*cloog_pointers__.p_stmt_ass) ++#define stmt_block (*cloog_pointers__.p_stmt_block) ++#define stmt_for (*cloog_pointers__.p_stmt_for) ++#define stmt_guard (*cloog_pointers__.p_stmt_guard) ++#define stmt_root (*cloog_pointers__.p_stmt_root) ++#define stmt_user (*cloog_pointers__.p_stmt_user) ++ + typedef struct poly_dr *poly_dr_p; + + typedef struct poly_bb *poly_bb_p; +--- a/gcc/graphite.c ++++ b/gcc/graphite.c +@@ -65,6 +65,34 @@ along with GCC; see the file COPYING3. If not see + + CloogState *cloog_state; + ++__typeof (cloog_pointers__) cloog_pointers__; ++ ++static bool ++init_cloog_pointers (void) ++{ ++ void *h; ++ ++ if (cloog_pointers__.inited) ++ return cloog_pointers__.h != NULL; ++ h = dlopen ("libcloog-isl.so.4", RTLD_LAZY); ++ cloog_pointers__.h = h; ++ if (h == NULL) ++ return false; ++#define DYNSYM(x) \ ++ do \ ++ { \ ++ union { __typeof (cloog_pointers__.p_##x) p; void *q; } u; \ ++ u.q = dlsym (h, #x); \ ++ if (u.q == NULL) \ ++ return false; \ ++ cloog_pointers__.p_##x = u.p; \ ++ } \ ++ while (0) ++ DYNSYMS ++#undef DYNSYM ++ return true; ++} ++ + /* Print global statistics to FILE. */ + + static void +@@ -263,6 +291,15 @@ graphite_transform_loops (void) + if (parallelized_function_p (cfun->decl)) + return; + ++ if (number_of_loops () <= 1) ++ return; ++ ++ if (!init_cloog_pointers ()) ++ { ++ sorry ("Graphite loop optimizations cannot be used"); ++ return; ++ } ++ + ctx = isl_ctx_alloc (); + isl_options_set_on_error(ctx, ISL_ON_ERROR_ABORT); + if (!graphite_initialize (ctx)) diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 7d480f752..9275ad514 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gcc -pkgver=4.7.3 -_piepatchver=0.5.3 +pkgver=4.8.1 +_piepatchver=0.5.6 _specs_ver=0.2.0 _specs_gcc_ver=4.4.3 _uclibc_abiver=0.9.32 -pkgrel=7 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" @@ -15,13 +15,27 @@ license="GPL LGPL" _gccrel=$pkgver-r$pkgrel depends="binutils libgomp=$_gccrel" makedepends="bison flex gmp-dev mpfr-dev texinfo mpc1-dev gawk zlib-dev zip - cloog-dev !libiconv-dev" + cloog-dev !libiconv-dev !gettext-dev" subpackages="$pkgname-doc libgcc libgomp libstdc++:libcxx g++:gpp" replaces="libstdc++" -if [ -n "$BOOTSTRAP" ]; then +if [ "$CBUILD" != "$CHOST" ]; then + # fixup flags. seems gcc treats CPPFLAGS as global without + # _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS. + export CFLAGS="$CPPFLAGS $CFLAGS" + export CXXFLAGS="$CPPFLAGS $CXXFLAGS" + unset CPPFLAGS + + # reset flags and cc for build + export CC_FOR_BUILD="gcc" + export CXX_FOR_BUILD="g++" + export CFLAGS_FOR_BUILD=" " + export CXXFLAGS_FOR_BUILD=" " + export LDFLAGS_FOR_BUILD=" " + LANG_OBJC=off LANG_JAVA=off + LANG_GO=off LANG_FORTRAN=off fi @@ -45,30 +59,34 @@ if [ "$LANG_FORTRAN" != "off" ]; then fi source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2 - http://distfiles.gentoo.org/distfiles/gcc-4.7.1-piepatches-v${_piepatchver}.tar.bz2 + http://distfiles.gentoo.org/distfiles/gcc-$pkgver-piepatches-v${_piepatchver}.tar.bz2 http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2 ftp://sourceware.org/pub/java/ecj-latest.jar - - 11_all_default-warn-format-security.patch + 12_all_default-warn-trampolines.patch - 15_all_libgomp-Werror.patch - 16_all_libgo-Werror-pr53679.patch - 29_all_arm_armv4t-default.patch - 49_all_gcc-4.7-x86-libitm-pr52695.patch + 15_all_libgfortran-Werror.patch + 16_all_libgomp-Werror.patch + 48_all_x86_pr53113_libitm-avx.patch + 50_all_libiberty-asprintf.patch 51_all_libiberty-pic.patch 67_all_gcc-poison-system-directories.patch - 74_all_gcc47_cloog-dl.patch + 74_all_gcc48_cloog-dl.patch gcc-spec-env.patch + gcc-4.8-musl.patch + libgcc-always-build-gcceh.a.patch pt_gnu_eh_frame.patch uclibc-getipinfo.patch - gcc-4.7-dynamic-linker.patch gcc-4.6-pr32219.patch + gcc-4.8-dynamic-linker.patch boehem-gc-uclibc.patch gcc-pure64.patch - gcc-go.patch + + gcc-4.8-build-args.patch + fix-cxxflags-passing.patch " +# gcc-go.patch # we build out-of-tree _gccdir="$srcdir"/gcc-$pkgver @@ -97,7 +115,7 @@ prepare() { case "$i" in *.patch) msg "Applying $i" - patch -p1 -i "$srcdir"/$i || _err="$_err $i" + patch -p1 -F3 -i "$srcdir"/$i || _err="$_err $i" ;; esac done @@ -128,8 +146,10 @@ prepare() { build() { local _dynamic_linker= + local _arch_configure= + local _symvers= cd "$_gccdir" - export CFLAGS="-fno-stack-protector" + export CFLAGS="-fno-stack-protector $CFLAGS" [ -z "$CBUILD" ] && CBUILD="$CHOST" [ -z "$CTARGET" ] && CTARGET="$CHOST" @@ -147,12 +167,35 @@ build() { _dynamic_linker="--with-dynamic-linker=ld-linux.so.2" ;; *) _dynamic_linker= + _symvers="--disable-symvers" + ;; + esac + + # disable symvers for non-glibc (uclibc/musl) + # ifunc attributes detection is broke in configure script so force + # disable it for non-glibc. It is used heavily by Go lang. + case "$CHOST" in + *-gnu) ;; + *) export libat_cv_have_ifunc=no ;; esac # --enable-target-optspace is broken on powerpc if [ "$CARCH" != "powerpc" ]; then - _target_optspace="--enable-target-optspace" + _arch_configure="$_arch_configure --enable-target-optspace" + fi + + case "$CARCH" in + arm*) _arch_configure="$_arch_configure --with-float=hard";; + esac + + if [ "${CHOST#*musl}" != "$CHOST" ]; then + # musl does not support mudflap + _arch_configure="$_arch_configure --disable-mudflap --disable-libmudflap" + # gcc does not detect musl's ssp support, force it + export gcc_cv_libc_provides_ssp=yes + else + _arch_configure="$_arch_configure --without-system-libunwind" fi msg "Building the following:" @@ -162,7 +205,7 @@ build() { echo " CTARGET=$CTARGET" echo " languages=$_languages" echo " dynamic_linker=$_dynamic_linker" - echo " target_optspace=$_target_optspace" + echo " arch_configure=$_arch_configure" echo "" mkdir -p "$_builddir" @@ -183,19 +226,19 @@ build() { --disable-multilib \ --disable-nls \ --disable-werror \ + $_symvers \ --enable-__cxa_atexit \ --enable-cld \ --enable-esp \ --enable-cloog-backend \ --enable-languages=$_languages \ --enable-shared \ - $_target_optspace \ + $_arch_configure \ --enable-tls \ --enable-threads \ $_dynamic_linker \ --with-dynamic-linker-prefix=/lib \ --with-system-zlib \ - --without-system-libunwind \ || return 1 make || return 1 @@ -228,7 +271,7 @@ package() { || return 1 # strip debug info from some statib libs - strip -g `find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \ + ${CROSS_COMPILE}strip -g `find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \ -o -name libmudflap.a -o -name libmudflapth.a \ -o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \ -o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \ @@ -240,8 +283,7 @@ package() { "$pkdir"/usr/lib/libgcj.spec # remove ffi - rm "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* \ - || return 1 + rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi* find "$pkgdir" -name 'ffi*.h' | xargs rm -f mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib @@ -299,7 +341,7 @@ libgcc() { pkgdesc="GNU C compiler runtime libraries" depends= mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libgcc_s.so.* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/libgcc_s.so.* "$subpkgdir"/usr/lib/ || return 1 } libgomp() { @@ -422,66 +464,72 @@ gfortran() { "$subpkgdir"/$_gcclibdir } -md5sums="86f428a30379bdee0224e353ee2f999e gcc-4.7.3.tar.bz2 -2e1d99664efcdbd86549a40ddf37d405 gcc-4.7.1-piepatches-v0.5.3.tar.bz2 +md5sums="3b2386c114cd74185aa3754b58a79304 gcc-4.8.1.tar.bz2 +f8ab875eee18868b319ad04dc19adcf6 gcc-4.8.1-piepatches-v0.5.6.tar.bz2 441c76504e1d97170117c294e65c7a72 gcc-4.4.3-specs-0.2.0.tar.bz2 d7cd6a27c8801e66cbaa964a039ecfdb ecj-latest.jar -34e4a0260e9dbd434ac84b9dda381240 11_all_default-warn-format-security.patch -1570f30f65f1c4941d2bd690a7148836 12_all_default-warn-trampolines.patch -6862cb5268fef68a4a1906e0c4ea0d46 15_all_libgomp-Werror.patch -2a6a0be54c283c311a39bba359cc01f4 16_all_libgo-Werror-pr53679.patch -681499caf97fbdb4d5c97e312cddf47c 29_all_arm_armv4t-default.patch -4e35639c74fe4b6111f74a91bb3d52a8 49_all_gcc-4.7-x86-libitm-pr52695.patch +f28e9334c58ce14f69a9e988026bc772 12_all_default-warn-trampolines.patch +7eb9ad894dfdf1b3d4a8a407a339a6f1 15_all_libgfortran-Werror.patch +452e457a0ac45e6f8f75eb6d6ba4d04b 16_all_libgomp-Werror.patch +8975abab9ee8ae5028a55e84b930cf02 48_all_x86_pr53113_libitm-avx.patch +326fa30475ba206cc2ef1666ec4314c8 50_all_libiberty-asprintf.patch d8692c56f04b92667096f59d843e95c5 51_all_libiberty-pic.patch -406fc6f29ab3d746eaef0202c50fd7e9 67_all_gcc-poison-system-directories.patch -f24f07ed008324eaecb0f75417c99116 74_all_gcc47_cloog-dl.patch +ca4f395856bbb80d23398246572c30fa 67_all_gcc-poison-system-directories.patch +9c443d9d0fba2ce97b12f674b7d14c7e 74_all_gcc48_cloog-dl.patch a695d7648509b4f8e18b389a19e6037c gcc-spec-env.patch +cd8ef37289815c939adc954ba95e9294 gcc-4.8-musl.patch +504c7dd8651c5d98229892c4cd9ea591 libgcc-always-build-gcceh.a.patch ab83248e10b2bf4b3d9240de0fefb52b pt_gnu_eh_frame.patch 6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch -ac11128f201ee00287f8852697cb86a6 gcc-4.7-dynamic-linker.patch 32e8e4c0e23ed8f5de95a591cb30f1da gcc-4.6-pr32219.patch +79d00ee1284fac5192456f7f7d3908aa gcc-4.8-dynamic-linker.patch 2c6cb49bb9bfd8b6e690222e66ccc901 boehem-gc-uclibc.patch 2e2b787bb988d9007c9f7ce42178dfe6 gcc-pure64.patch -c94014ece84407a36d239417a2bad25d gcc-go.patch" -sha256sums="2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 gcc-4.7.3.tar.bz2 -26aee7449cd3cd642065a0860d723dbb8062066ad87a398241f61210c68513d9 gcc-4.7.1-piepatches-v0.5.3.tar.bz2 +0a2041bbf83648e6c4f6d3484f7249ca gcc-4.8-build-args.patch +4aea37d334ab00bb6bba37cd8c481367 fix-cxxflags-passing.patch" +sha256sums="545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813 gcc-4.8.1.tar.bz2 +4aa0ab0f114b0ff8af5d0c19c18930e3fcd5e5b0956f56ca24e58e5a243964b1 gcc-4.8.1-piepatches-v0.5.6.tar.bz2 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 gcc-4.4.3-specs-0.2.0.tar.bz2 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 ecj-latest.jar -719e2db2e0adcfd6c0bf3ee3712a962f5ec9dc8ee475861a9d7ee5da25a41a41 11_all_default-warn-format-security.patch -f3d3a925e447da0e4fe477e4e3452f7ab45dffcf80acc68ba466efaae7aea8e1 12_all_default-warn-trampolines.patch -f43fd9c30a6cf80305cf4be84921a943fd7a68154a450d1577576c57b7f2deb7 15_all_libgomp-Werror.patch -4adf7ae1af31065e5b867ade3337fdaf0122ab0649a1fcaa4daf41f4ad06ca5d 16_all_libgo-Werror-pr53679.patch -afa6b519d1e4351f27d0433748d70c9f7d7766bb54ba64283346cee7baffbdcd 29_all_arm_armv4t-default.patch -8ed840574cfd92be21eaff4080f203c1ca117062a6da609753c357ab47f6c5f4 49_all_gcc-4.7-x86-libitm-pr52695.patch +ce7774aa13be5da274220258772ccbdd6f54abdad97a3798ba282865c809f042 12_all_default-warn-trampolines.patch +8b1450d5a7756af2b890588005690785a663601e2b1533671b609aa8cce0f718 15_all_libgfortran-Werror.patch +1f106fe03cede7c697bde7d81732e0d3bb2c7197e4967789182a5fd8db532900 16_all_libgomp-Werror.patch +cead5b092ab4881e8b830d51c0037a8fb149bab632e7661aa505ba574295e0e4 48_all_x86_pr53113_libitm-avx.patch +38f7c0841d99c6dd3610cd5618b68dd6579713c018eaed856217fc4263bcf6a6 50_all_libiberty-asprintf.patch da6bbb5dc654d5e1df8ecae5c9ebb56265426c405931f14f5878248b8c79f78d 51_all_libiberty-pic.patch -830028c0d08f43a0f5ae1f60c20256f1cad6bdae95c05ac901a10bf5a7406899 67_all_gcc-poison-system-directories.patch -ce041ae09033d8d170a942b30f26d85ef720bf846c90963b39083c2963334c82 74_all_gcc47_cloog-dl.patch +8ba9dec0ecc2620c8ab1dfbeb0708dd4c29021e57d2e0ea23720108b1db3462e 67_all_gcc-poison-system-directories.patch +7d129093a6682418da9313611a90e3052855d8af4505d401f7b8b6a64e8f7b17 74_all_gcc48_cloog-dl.patch 64b01f29fb853fee5ecda998b66eeaa7ec86ff1fc3b21432bfd69eb543c93e6a gcc-spec-env.patch +8b85ebc6603a1b3488e1eb800fdb00168515ae154006398a1a08af57c1d3b5b5 gcc-4.8-musl.patch +1975189156d70f5428cb7f1516533965d1c8734f3009fc89a9b8e289b72326f1 libgcc-always-build-gcceh.a.patch 78e75cb378bdfe870c98ab3cffef37f54be729d3912979191f27ca00651ad6c4 pt_gnu_eh_frame.patch 53184f842477569973c232dac7c85e71b0018cbe5c4962f95dd9e0273f42083e uclibc-getipinfo.patch -633b46b3b433550a1ad8f3150904eec0a5fee5f3a284d38dc0b7013f45505b96 gcc-4.7-dynamic-linker.patch 89207a8b62137a857ee2c43499d6b5247d37b530d1338844dbb330a6846b2ad2 gcc-4.6-pr32219.patch +f3863b997acf8fdf5ad1d3626b41a8a0670b896505e9b7afb517916c7599fb1c gcc-4.8-dynamic-linker.patch 02751ccf223dcfc898c0ce2214cd0859d275e90b742f1a66e38db5c50f94b38c boehem-gc-uclibc.patch f5473c6aea96d5137defd68898ba31042944a3f3ed26c05b964a40bd876c6f47 gcc-pure64.patch -e6b57e7c7d860550a4f7befa3e622024ba077a5906e6f2fd104b33fd47921be0 gcc-go.patch" -sha512sums="5671a2dd3b6ac0d23f305cb11a796aebd823c1462b873136b412e660966143f4e07439bd8926c1443b78442beb6ae370ef91d819ec615920294875b722b7b0bd gcc-4.7.3.tar.bz2 -47e16c41ec6678f9960bd39b8f7f01a0a956ae112584c3aa8b7fa5107eef1b598eba191d5199280131399ff096a1b0d14c9b5799cdfee837451e48a3405b2374 gcc-4.7.1-piepatches-v0.5.3.tar.bz2 +bd7a6f514fcc457f29e5fda157203f3bcd013aeba5d53b3459196eef3ce752ab gcc-4.8-build-args.patch +a395ba4cf047c48cac56985726fddf0948f4425c9f1a0c9ddba1812b2b3d8300 fix-cxxflags-passing.patch" +sha512sums="1becc874aad77a469069b6d9da4158aae9e013e24afa9364fe4feff9a5094d0673ee7694b3840e892c860f73a56b3ece6174338a8214438c42b9f86dd6c35ea7 gcc-4.8.1.tar.bz2 +274e16ef5136348415898d4e5a3bc71763078de8ae7c18645e8b07f54d705609b08c0efadbdb55117fdfb5f6490529b446d09def448174c2747372829d029a9d gcc-4.8.1-piepatches-v0.5.6.tar.bz2 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 gcc-4.4.3-specs-0.2.0.tar.bz2 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e ecj-latest.jar -4770792001da2e1e0da16ad12e48a829d56c5622d001b055dbc3d459c28ba55b544ad8e5819b911011ada68d53fa0f6cb6f6621ea988755e449d0b65648c7976 11_all_default-warn-format-security.patch -5d591ed6d0a04e9c343cd80e3c2f89ad724523e7215c822f23f28e536b7bb1307bac7816135c34e7d2a7aed8177de762776e2d4ae840c2f34dfcbd7b95eeb72e 12_all_default-warn-trampolines.patch -f8dfe0b6907fab10009ab009f7b23df80a2b900c02da672f2d795e7609ec344d6ae66e521518d5d77c4390797090d4825f39b73c42e3632ac7b3f38f22c18e1a 15_all_libgomp-Werror.patch -0d1f414b46a686736833f6af48d0026f759b4f68a39da0d87d5845a78d33b57028765bd962d43615245613c36f6854eb0ca741d8cfa142bb3d918e607808bb5a 16_all_libgo-Werror-pr53679.patch -3a9c319481ca79ad76d80312040d8cc4c14717b36c98de8b2a70444acfce00ca38f08dedeef951c363c719901fee0d4c3f0ad2ec48d2598a8f79cf4a46b5d14b 29_all_arm_armv4t-default.patch -4c8e8968e0d549da5871cc01f456b7d91055b3c6ef1f7c15ed3024402a64c7ecb9f2b0609ce9e7ed09a120431858c1f0e2bc2fa14a316a11824aca6f3604fce1 49_all_gcc-4.7-x86-libitm-pr52695.patch +5069e4b741488913a646a9b5d871af8e7f7a606158ea09305d0ddd46257c5b659770627bc2ca3abeaae039da1717b3ba6c9cd90554a441da74eb4ecf24c13074 12_all_default-warn-trampolines.patch +c18a99b7303a734fe4dca9d4e90e21d18e5bd71c7d91e1a26c86b1354c73f567590a875941bfe64ce59f0393023b91c606c96b30885c55b98a790c3ab0c84ca7 15_all_libgfortran-Werror.patch +433404fd9bfa172d69fff4a5505e8648cbbbf5f052d2b4235608ff7af0c4063d557d25d80c85c5bd0d1e1ed64b568e7bbc0cdbce11cc74db4c0189af3a01634a 16_all_libgomp-Werror.patch +ff16f259fff8d78230593eee8641eab5a72c5c517c6ac5f09597edbc624d964b33f185a0dd5772d6029f757a5edb66431b3eab77dac71e76a0ef155bb7443d2c 48_all_x86_pr53113_libitm-avx.patch +c6c314a2d24531b4286436dec7189f83e443c4cfa9b88339a4c324c2d40812d766ed44dcfd4a0c3b67695bb76969a4d8a9784ff95876ceba23def305ef8a48f8 50_all_libiberty-asprintf.patch 0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca 51_all_libiberty-pic.patch -77d9383361bbc6701b34ba35356a09b97ebd45d8595c79bac9e3b8277def83caef47418ed813c2d138f2016779dce511c6e68155787c2462ab8ca1479c46c967 67_all_gcc-poison-system-directories.patch -739fd5e05dbab5090802eb447c24d5f03ed0b581f76acd8d69729c1bbfab9f92a41491eb313415f0f0e80cd80961eb8ea420170efbd705136d682ba71cff87da 74_all_gcc47_cloog-dl.patch +47331f034e44aea16f1cbb67d9176f8ce8832d6cb7c13a8d3b438efaa3269cee177bd1dd8a9f353ac19cc6b3db436a995de9ae66d493d2772188630b09fbff51 67_all_gcc-poison-system-directories.patch +6e19b2dc43cff03a6b3ca4e18f76dcfd5b0682c15aac493e94f5c679f5b0a585fbaa09345d200182c0f47541ced2d714b78d65da130bc7d2e9f810362e07037d 74_all_gcc48_cloog-dl.patch ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48 gcc-spec-env.patch +86ffdd09993004bc093233fcb1ea77d3a17965ccc0e09c59276b8f9e8ad79ae90eb6c6a3942472c638e9de31d2c83a25a46eee0903877033b46447e9f90258f8 gcc-4.8-musl.patch +d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch 8464197f01d107872dfa6b47e86e95ae8d75c053527bafbdb7a86bcc7aff4bc5b20a8ec40d6e48d1ad455b0187a3cba9db337cff6c0a6245507c4533e4832d99 pt_gnu_eh_frame.patch e3edf75df1f27af8771bd263e1bd607f6207c4eb5b2a5e11032577deba43ea201825e3b5008a720105f24e49d2821dd77a61c7ceba7ed91b3621c0dbd9292fc6 uclibc-getipinfo.patch -91332bea084d13d165bac8abe826c3656f77c8872898a4d86b7e258dbf5af85d1b25b7e51f262f4b19b11ca89bf5d77ab0ac5554068419f15bf017a37a9d1822 gcc-4.7-dynamic-linker.patch 9fc5e32f2573ae67b6cf22119d636d10a47c42718635bceff7d457a93a3f664ae1ed10e154f70964ba2d26b0de04f879a8c05de6411112760d40433373dd0a80 gcc-4.6-pr32219.patch +db84b6582950378116723116be4f277881f7bdd05add216c58c2b86c0fb3a70abeb7798507a74a64b9b949d5b311167bd4df84a048d2d2d32f5836ea1d34c42e gcc-4.8-dynamic-linker.patch e1d6a450dfb40b134ad7f759c4c10174d2490b0093fe47cb33479245f26a3a8c54ebcf6255943c0ccfcb5095600d1c05e530baeed35609c8ffe75caac8e57c49 boehem-gc-uclibc.patch 4a5aeff0399782c752e6e3f2f48d984b2056dfb5d229b23a24eee1562d241339989b2203f139821cfc03c9b25c9bd7da6ccbbdc7a09d242e4de7f0d606c6f63c gcc-pure64.patch -1a09175bbb9c457893d4e921aa1bfe81fa7d657255d76ddb45f2f6db9232fb74bbc5fbac74d29d972ef74ab01df6a1a70e9ce83092e434a2d7c6b4155ea177b8 gcc-go.patch" +abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1ca7d49fd0b5e351532aa15a3b13362abbf1ca4266f54a687 gcc-4.8-build-args.patch +35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282 fix-cxxflags-passing.patch" diff --git a/main/gcc/fix-cxxflags-passing.patch b/main/gcc/fix-cxxflags-passing.patch new file mode 100644 index 000000000..8eb1de77d --- /dev/null +++ b/main/gcc/fix-cxxflags-passing.patch @@ -0,0 +1,10 @@ +--- gcc-4.8.1/Makefile.in.orig ++++ gcc-4.8.1/Makefile.in +@@ -169,6 +169,7 @@ + # built for the build system to override those in BASE_FLAGS_TO_PASSS. + EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ ++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + + # This is the list of directories to built for the host system. diff --git a/main/gcc/gcc-4.8-build-args.patch b/main/gcc/gcc-4.8-build-args.patch new file mode 100644 index 000000000..c27e00961 --- /dev/null +++ b/main/gcc/gcc-4.8-build-args.patch @@ -0,0 +1,41 @@ +When cross compiling a target gcc, target flags may be used on the host + +Configure identifies a number of warning flags (WARN_CFLAGS and +WARN_CXXFLAGS) from the $CC value. The cross compiler may be different +from the host compiler and may not support the same set of flags. This +leads to problems such as: + +cc1plus: error: unrecognized command line option "-Wno-narrowing" +cc1plus: error: unrecognized command line option "-Wno-overlength-strings" + +Work around this problem by removing the warning flags from the +BUILD_CXXFLAGS value, in a way similar to the BUILD_CFLAGS. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: gcc-4.8.0/gcc/configure +=================================================================== +--- gcc-4.8.0.orig/gcc/configure ++++ gcc-4.8.0/gcc/configure +@@ -11720,6 +10581,7 @@ STMP_FIXINC=stmp-fixinc + if test x$build != x$host || test "x$coverage_flags" != x + then + BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' ++ BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' + fi + +Index: gcc-4.8.0/gcc/configure.ac +=================================================================== +--- gcc-4.8.0.orig/gcc/configure.ac ++++ gcc-4.8.0/gcc/configure.ac +@@ -1901,6 +1901,7 @@ STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_F + if test x$build != x$host || test "x$coverage_flags" != x + then + BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' ++ BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' + fi + diff --git a/main/gcc/gcc-4.7-dynamic-linker.patch b/main/gcc/gcc-4.8-dynamic-linker.patch index 7fe57a49f..d49b85b36 100644 --- a/main/gcc/gcc-4.7-dynamic-linker.patch +++ b/main/gcc/gcc-4.8-dynamic-linker.patch @@ -1,8 +1,30 @@ +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 4b04d64..2fc3b95 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -987,7 +987,7 @@ INTERNAL_CFLAGS = -DIN_GCC @CROSS@ + # This is the variable actually used when we compile. If you change this, + # you probably want to update BUILD_CFLAGS in configure.ac + ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \ +- $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ ++ $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ @NOSTDINC@ + + # The C++ version. + ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) $(INTERNAL_CFLAGS) \ +@@ -2030,6 +2030,8 @@ DRIVER_DEFINES = \ + -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ + -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ ++ -DDYNAMIC_LINKER_PREFIX=\"@DYNAMICLINKERPREFIX@\" \ ++ -DDYNAMIC_LINKER=\"@DYNAMICLINKER@\" \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ + -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ + -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \ diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h -index f578ecb..ff4d2ce 100644 +index 84e0596..59b9e80 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h -@@ -24,8 +24,8 @@ along with GCC; see the file COPYING3. If not see +@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see #define EXTRA_SPECS \ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, @@ -14,23 +36,39 @@ index f578ecb..ff4d2ce 100644 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h -index 80bd825..64b4595 100644 +index 4a425c8..0ec2653 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h -@@ -62,7 +62,7 @@ - /* Use ld-linux.so.3 so that it will be possible to run "classic" - GNU/Linux binaries on an EABI system. */ +@@ -59,23 +59,8 @@ + #undef SUBTARGET_EXTRA_LINK_SPEC + #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION + +-/* GNU/Linux on ARM currently supports three dynamic linkers: +- - ld-linux.so.2 - for the legacy ABI +- - ld-linux.so.3 - for the EABI-derived soft-float ABI +- - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI. +- All the dynamic linkers live in /lib. +- We default to soft-float, but this can be overridden by changing both +- GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ +- #undef GLIBC_DYNAMIC_LINKER --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" +-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" +-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" +-#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT +- +-#define GLIBC_DYNAMIC_LINKER \ +- "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ +- %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ +- %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" +#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to use the GNU/Linux version, not the generic BPABI version. */ diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index 270e12b..dd613ef 100644 +index 488efa4..23c8efb 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h -@@ -59,7 +59,7 @@ +@@ -57,7 +57,7 @@ #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" @@ -40,7 +78,7 @@ index 270e12b..dd613ef 100644 #define LINUX_TARGET_LINK_SPEC "%{h*} \ %{static:-Bstatic} \ diff --git a/gcc/config/bfin/linux.h b/gcc/config/bfin/linux.h -index f91cf17..263351a 100644 +index 2cd7c51..b0c8531 100644 --- a/gcc/config/bfin/linux.h +++ b/gcc/config/bfin/linux.h @@ -45,7 +45,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -53,10 +91,10 @@ index f91cf17..263351a 100644 #undef TARGET_SUPPORTS_SYNC_CALLS diff --git a/gcc/config/cris/linux.h b/gcc/config/cris/linux.h -index df10721..35f6d77 100644 +index 8d0941c..4ea98a4 100644 --- a/gcc/config/cris/linux.h +++ b/gcc/config/cris/linux.h -@@ -103,7 +103,7 @@ along with GCC; see the file COPYING3. If not see +@@ -102,7 +102,7 @@ along with GCC; see the file COPYING3. If not see #undef CRIS_DEFAULT_CPU_VERSION #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG @@ -66,10 +104,10 @@ index df10721..35f6d77 100644 #undef CRIS_LINK_SUBTARGET_SPEC #define CRIS_LINK_SUBTARGET_SPEC \ diff --git a/gcc/config/freebsd-spec.h b/gcc/config/freebsd-spec.h -index 770a3d1..bd02fd6 100644 +index e46449c..17fae77 100644 --- a/gcc/config/freebsd-spec.h +++ b/gcc/config/freebsd-spec.h -@@ -129,9 +129,9 @@ is built with the --enable-threads configure-time option.} \ +@@ -128,9 +128,9 @@ is built with the --enable-threads configure-time option.} \ #endif #if FBSD_MAJOR < 6 @@ -82,10 +120,10 @@ index 770a3d1..bd02fd6 100644 /* NOTE: The freebsd-spec.h header is included also for various diff --git a/gcc/config/frv/linux.h b/gcc/config/frv/linux.h -index 9847712..089afdf 100644 +index 2c0d35c..86f653b 100644 --- a/gcc/config/frv/linux.h +++ b/gcc/config/frv/linux.h -@@ -35,7 +35,7 @@ +@@ -34,7 +34,7 @@ #define ENDFILE_SPEC \ "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" @@ -95,20 +133,20 @@ index 9847712..089afdf 100644 #undef LINK_SPEC #define LINK_SPEC "\ diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h -index 73681fe..8c51d30 100644 +index 3c95ee0..89cc00c 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h -@@ -21,4 +21,4 @@ along with GCC; see the file COPYING3. If not see +@@ -20,4 +20,4 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #define GNU_USER_LINK_EMULATION "elf_i386" -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h -index 5b0a212..185c911 100644 +index b793e08..e7c41b5 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h -@@ -28,6 +28,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -27,6 +27,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define GNU_USER_LINK_EMULATION64 "elf_x86_64" #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" @@ -119,10 +157,10 @@ index 5b0a212..185c911 100644 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" + diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h -index 00b0ddb..de6bb1e 100644 +index bdd6248..3558443 100644 --- a/gcc/config/ia64/linux.h +++ b/gcc/config/ia64/linux.h -@@ -56,7 +56,7 @@ do { \ +@@ -55,7 +55,7 @@ do { \ /* Define this for shared library support because it isn't in the main linux.h file. */ @@ -132,10 +170,10 @@ index 00b0ddb..de6bb1e 100644 #undef LINK_SPEC #define LINK_SPEC "\ diff --git a/gcc/config/knetbsd-gnu.h b/gcc/config/knetbsd-gnu.h -index 30fa99a..5059b85 100644 +index 75d9e11..bf8409d 100644 --- a/gcc/config/knetbsd-gnu.h +++ b/gcc/config/knetbsd-gnu.h -@@ -33,4 +33,5 @@ along with GCC; see the file COPYING3. If not see +@@ -32,4 +32,5 @@ along with GCC; see the file COPYING3. If not see #undef GNU_USER_DYNAMIC_LINKER @@ -143,10 +181,10 @@ index 30fa99a..5059b85 100644 +#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index dbbeea5..0147ece 100644 +index 2be1079..3db010b 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h -@@ -74,10 +74,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -73,10 +73,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see GLIBC_DYNAMIC_LINKER must be defined for each target using them, or GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets supporting both 32-bit and 64-bit compilation. */ @@ -171,10 +209,10 @@ index dbbeea5..0147ece 100644 +#define STANDARD_INCLUDE_DIR 0 +#endif diff --git a/gcc/config/m32r/linux.h b/gcc/config/m32r/linux.h -index bc7802b..6ff030f 100644 +index a6dff08..54fe8e2 100644 --- a/gcc/config/m32r/linux.h +++ b/gcc/config/m32r/linux.h -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ When the -shared link option is used a final link is not being done. */ @@ -184,10 +222,10 @@ index bc7802b..6ff030f 100644 #undef LINK_SPEC #if TARGET_LITTLE_ENDIAN diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h -index 325faf7..01bb765 100644 +index 6450f3b..09f9d70 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h -@@ -72,7 +72,7 @@ along with GCC; see the file COPYING3. If not see +@@ -71,7 +71,7 @@ along with GCC; see the file COPYING3. If not see When the -shared link option is used a final link is not being done. */ @@ -197,10 +235,10 @@ index 325faf7..01bb765 100644 #undef LINK_SPEC #define LINK_SPEC "-m m68kelf %{shared} \ diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index bce9c17..46a2b0f 100644 +index 9b4c68d..5eab217 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h -@@ -18,4 +18,5 @@ You should have received a copy of the GNU General Public License +@@ -17,4 +17,5 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ @@ -208,10 +246,10 @@ index bce9c17..46a2b0f 100644 +#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER + diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h -index 6e92719..736aa6d 100644 +index dbba47a..d320d82 100644 --- a/gcc/config/mips/linux64.h +++ b/gcc/config/mips/linux64.h -@@ -23,11 +23,11 @@ along with GCC; see the file COPYING3. If not see +@@ -22,11 +22,11 @@ along with GCC; see the file COPYING3. If not see #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" @@ -229,10 +267,10 @@ index 6e92719..736aa6d 100644 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ BIONIC_DYNAMIC_LINKERN32) diff --git a/gcc/config/mn10300/linux.h b/gcc/config/mn10300/linux.h -index d63b95a..93c54b1 100644 +index 16d3047..e03d463 100644 --- a/gcc/config/mn10300/linux.h +++ b/gcc/config/mn10300/linux.h -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #undef ASM_SPEC #define ASM_SPEC "" @@ -242,10 +280,10 @@ index d63b95a..93c54b1 100644 #undef LINK_SPEC #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 7c516eb..687264e 100644 +index dc6f67f..7d5d290 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h -@@ -358,10 +358,10 @@ extern int dot_symbols; +@@ -360,10 +360,10 @@ extern int dot_symbols; #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" @@ -261,10 +299,10 @@ index 7c516eb..687264e 100644 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h -index e5385ec..72df4ac 100644 +index 3b4966a..46df5f6 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h -@@ -61,8 +61,8 @@ along with GCC; see the file COPYING3. If not see +@@ -60,8 +60,8 @@ along with GCC; see the file COPYING3. If not see #define MULTILIB_DEFAULTS { "m31" } #endif @@ -276,10 +314,10 @@ index e5385ec..72df4ac 100644 #undef LINK_SPEC #define LINK_SPEC \ diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h -index a5c2734..9eff3c4 100644 +index 9e8f32d..ad31782 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h -@@ -45,7 +45,7 @@ along with GCC; see the file COPYING3. If not see +@@ -43,7 +43,7 @@ along with GCC; see the file COPYING3. If not see #define TARGET_ASM_FILE_END file_end_indicate_exec_stack @@ -289,10 +327,10 @@ index a5c2734..9eff3c4 100644 #undef SUBTARGET_LINK_EMUL_SUFFIX #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h -index 60dc869..9930e21 100644 +index 49283d3..d068de6 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h -@@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); +@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); When the -shared link option is used a final link is not being done. */ @@ -300,12 +338,12 @@ index 60dc869..9930e21 100644 +#define GLIBC_DYNAMIC_LINKER DYNAMIC_LINKER_PREFIX "/" DYNAMIC_LINKER #undef LINK_SPEC - #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ + #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h -index 14966b9..c134401 100644 +index 7d48e96..07e4112 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h -@@ -93,8 +93,8 @@ along with GCC; see the file COPYING3. If not see +@@ -92,8 +92,8 @@ along with GCC; see the file COPYING3. If not see When the -shared link option is used a final link is not being done. */ @@ -317,10 +355,10 @@ index 14966b9..c134401 100644 #ifdef SPARC_BI_ARCH diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index f5caeb7..c9274e4 100644 +index 10e22a4..52fa40b 100644 --- a/gcc/config/xtensa/linux.h +++ b/gcc/config/xtensa/linux.h -@@ -45,7 +45,7 @@ along with GCC; see the file COPYING3. If not see +@@ -44,7 +44,7 @@ along with GCC; see the file COPYING3. If not see %{mlongcalls:--longcalls} \ %{mno-longcalls:--no-longcalls}" @@ -330,7 +368,7 @@ index f5caeb7..c9274e4 100644 #undef LINK_SPEC #define LINK_SPEC \ diff --git a/gcc/configure b/gcc/configure -index 3e9152a..4e1fdd3 100755 +index feb9a5e..a020d8f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -755,6 +755,9 @@ AWK @@ -343,26 +381,25 @@ index 3e9152a..4e1fdd3 100755 PKGVERSION CONFIGURE_SPECS CROSS_SYSTEM_HEADER_DIR -@@ -1669,6 +1672,18 @@ Optional Packages: - --with-gc={page,zone} choose the garbage collection mechanism to use with +@@ -1673,6 +1676,17 @@ Optional Packages: + choose the garbage collection mechanism to use with the compiler --with-system-zlib use installed libz + --with-dynamic-linker=PATH + specifies path to dynamic linker. + example: "/lib/ld-linux.so.2", where this defines -+ "ld-linux.so.2" ++ "ld-linux.so.2" + --with-dynamic-linker-prefix=PATH + specifies path to dynamic linker. + example: "/lib/ld-linux.so.2", where this defines -+ "/lib" ++ "/lib" + --with-nostdinc build gcc to ignore standard include directories. + You will have to use --with-local-prefix with this -+ option. -+ ++ option. --with-linker-hash-style={sysv,gnu,both} specify the linker hash style -@@ -6378,6 +6393,47 @@ fi +@@ -6384,6 +6398,47 @@ fi @@ -410,23 +447,3 @@ index 3e9152a..4e1fdd3 100755 # --------------------- # Warnings and checking ---- ./gcc/Makefile.in.orig -+++ ./gcc/Makefile.in -@@ -986,7 +986,7 @@ - # This is the variable actually used when we compile. If you change this, - # you probably want to update BUILD_CFLAGS in configure.ac - ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \ -- $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ -+ $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ @NOSTDINC@ - - # The C++ version. - ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) \ -@@ -2090,6 +2090,8 @@ - -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ - -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ - -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \ -+ -DDYNAMIC_LINKER_PREFIX=\"@DYNAMICLINKERPREFIX@\" \ -+ -DDYNAMIC_LINKER=\"@DYNAMICLINKER@\" \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ - -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ - -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \ diff --git a/main/gcc/gcc-4.8-musl.patch b/main/gcc/gcc-4.8-musl.patch new file mode 100644 index 000000000..4c32a3e58 --- /dev/null +++ b/main/gcc/gcc-4.8-musl.patch @@ -0,0 +1,399 @@ +11b7c7e47a01 tip +# HG changeset patch +# Parent 6b1b8174ce29396d7dbd482296f43eba38948222 +Support for arm-linux-musl. + +diff -r 6b1b8174ce29 gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Fri Mar 29 16:41:20 2013 -0400 ++++ b/gcc/config/arm/linux-eabi.h Fri Mar 29 16:41:23 2013 -0400 +@@ -77,6 +77,10 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + ++/* musl has no "classic" (i.e. broken) mode */ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -r 6b1b8174ce29 libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Fri Mar 29 16:41:20 2013 -0400 ++++ b/libitm/config/arm/hwcap.cc Fri Mar 29 16:41:23 2013 -0400 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include <unistd.h> ++#ifdef __GLIBC__ + #include <sys/fcntl.h> ++#else ++#include <fcntl.h> ++#endif + #include <elf.h> + + static void __attribute__((constructor)) +# HG changeset patch +# Parent 2b29df135cf04fe23c38301f6d0fc5796366aecf +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r 2b29df135cf0 gcc/config.gcc +--- a/gcc/config.gcc Fri Mar 29 16:41:11 2013 -0400 ++++ b/gcc/config.gcc Fri Mar 29 16:41:14 2013 -0400 +@@ -549,7 +549,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # Common parts for widely ported systems. + case ${target} in +@@ -652,6 +652,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +diff -r 2b29df135cf0 gcc/config/linux.h +--- a/gcc/config/linux.h Fri Mar 29 16:41:11 2013 -0400 ++++ b/gcc/config/linux.h Fri Mar 29 16:41:14 2013 -0400 +@@ -32,10 +32,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -53,18 +55,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -84,16 +89,16 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Determine whether the entire c99 runtime + is present in the runtime library. */ +diff -r 2b29df135cf0 gcc/config/linux.opt +--- a/gcc/config/linux.opt Fri Mar 29 16:41:11 2013 -0400 ++++ b/gcc/config/linux.opt Fri Mar 29 16:41:14 2013 -0400 +@@ -30,3 +30,7 @@ + muclibc + Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) ++Use musl C library +diff -r 2b29df135cf0 gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Fri Mar 29 16:41:11 2013 -0400 ++++ b/gcc/ginclude/stddef.h Fri Mar 29 16:41:14 2013 -0400 +@@ -181,6 +181,7 @@ + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -197,6 +198,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -214,6 +216,7 @@ + typedef long ssize_t; + #endif /* __BEOS__ */ + #endif /* !(defined (__GNUG__) && defined (size_t)) */ ++#endif /* __DEFINED_size_t */ + #endif /* __size_t */ + #endif /* _SIZET_ */ + #endif /* _GCC_SIZE_T */ +# HG changeset patch +# Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785 +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r 2b94537ce249 libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Fri Mar 29 16:41:14 2013 -0400 ++++ b/libgomp/config/posix/time.c Fri Mar 29 16:41:17 2013 -0400 +@@ -28,6 +28,8 @@ + The following implementation uses the most simple POSIX routines. + If present, POSIX 4 clocks should be used instead. */ + ++#define _POSIX_C_SOURCE 199309L /* for clocks */ ++ + #include "libgomp.h" + #include <unistd.h> + #if TIME_WITH_SYS_TIME +# HG changeset patch +# Parent f50bb54f331f73405131a30b4f353cfda1c70304 +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r f50bb54f331f libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Fri Mar 29 16:38:52 2013 -0400 ++++ b/libstdc++-v3/configure.host Fri Mar 29 16:41:10 2013 -0400 +@@ -264,6 +264,13 @@ + os_include_dir="os/bsd/freebsd" + ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) ++ # check for musl by target ++ case "${host_os}" in ++ *-musl*) ++ os_include_dir="os/generic" ++ ;; ++ *) ++ + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then +@@ -272,6 +279,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; +# HG changeset patch +# Parent 62831d7bf931658019ba16092c48375177d014b1 +Support for mips-linux-musl. + +diff -r 62831d7bf931 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Fri Mar 29 16:41:23 2013 -0400 ++++ b/gcc/config/mips/linux.h Fri Mar 29 16:41:25 2013 -0400 +@@ -18,3 +18,5 @@ + <http://www.gnu.org/licenses/>. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" +# HG changeset patch +# Parent 2ffe76b215fdb082cbbc262536077627757fa9bf +Support for powerpc-linux-musl. + +diff -r 2ffe76b215fd gcc/config.gcc +--- a/gcc/config.gcc Fri Mar 29 16:41:26 2013 -0400 ++++ b/gcc/config.gcc Fri Mar 29 16:41:28 2013 -0400 +@@ -2112,6 +2112,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi +diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:26 2013 -0400 ++++ b/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:28 2013 -0400 +@@ -364,17 +364,21 @@ + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + + + #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ +diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:26 2013 -0400 ++++ b/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:28 2013 -0400 +@@ -18,3 +18,4 @@ + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400 ++++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400 +@@ -551,6 +551,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler and set correct endian mode. */ + #define CC1_SPEC "%{G*} %(cc1_cpu) \ +@@ -611,7 +614,8 @@ + %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \ + %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \ + %{mcall-i960-old: --oformat elf32-powerpcle} \ +- }}}}" ++ }}}} \ ++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" + + /* Any specific OS flags. */ + #define LINK_OS_SPEC "\ +@@ -789,15 +793,18 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -923,6 +930,7 @@ + { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \ + { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ +diff -r 2ffe76b215fd libgcc/config/rs6000/linux-unwind.h +--- a/libgcc/config/rs6000/linux-unwind.h Fri Mar 29 16:41:26 2013 -0400 ++++ b/libgcc/config/rs6000/linux-unwind.h Fri Mar 29 16:41:28 2013 -0400 +@@ -258,6 +258,7 @@ + + return _URC_NO_REASON; + } ++#endif + + #define MD_FROB_UPDATE_CONTEXT frob_update_context + +# HG changeset patch +# Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r 3ea10cd626cb gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Fri Mar 29 16:41:17 2013 -0400 ++++ b/gcc/config/i386/linux.h Fri Mar 29 16:41:20 2013 -0400 +@@ -21,3 +21,4 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -r 3ea10cd626cb gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400 ++++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400 +@@ -30,3 +30,7 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:17 2013 -0400 ++++ b/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:20 2013 -0400 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H diff --git a/main/gcc/gcc-go.patch b/main/gcc/gcc-go.patch deleted file mode 100644 index a882a5a38..000000000 --- a/main/gcc/gcc-go.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc-4.6.1.orig/gcc/go/Make-lang.in -+++ gcc-4.6.1/gcc/go/Make-lang.in -@@ -63,7 +63,7 @@ - go/unsafe.o - - go1$(exeext): $(GO_OBJS) attribs.o $(BACKEND) $(LIBDEPS) -- $(CXX) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ \ -+ $(CXX) $(ALL_CXXFLAGS) $(LDFLAGS) -fno-PIE -o $@ \ - $(GO_OBJS) attribs.o $(BACKEND) $(LIBS) $(BACKENDLIBS) - - # Documentation. diff --git a/main/gcc/libgcc-always-build-gcceh.a.patch b/main/gcc/libgcc-always-build-gcceh.a.patch new file mode 100644 index 000000000..74ae89730 --- /dev/null +++ b/main/gcc/libgcc-always-build-gcceh.a.patch @@ -0,0 +1,39 @@ +Highly inspired by: + http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch + +diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in +--- gcc-4.6.0.orig/libgcc/Makefile.in 2011-01-26 05:19:58.000000000 +0100 ++++ gcc-4.6.0/libgcc/Makefile.in 2011-09-12 18:17:12.743718974 +0200 +@@ -772,8 +772,9 @@ + libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT) + endif + ++all: libgcc_eh.a + ifeq ($(enable_shared),yes) +-all: libgcc_eh.a libgcc_s$(SHLIB_EXT) ++all: libgcc_s$(SHLIB_EXT) + ifneq ($(LIBUNWIND),) + all: libunwind$(SHLIB_EXT) + endif +@@ -950,10 +951,6 @@ + install-shared: + $(mkinstalldirs) $(DESTDIR)$(inst_libdir) + +- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ +- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a +- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a +- + $(subst @multilib_dir@,$(MULTIDIR),$(subst \ + @shlib_base_name@,libgcc_s,$(subst \ + @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL)))) +@@ -968,6 +965,10 @@ + chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a + $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a + ++ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ ++ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a ++ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a ++ + parts="$(INSTALL_PARTS)"; \ + for file in $$parts; do \ + rm -f $(DESTDIR)$(inst_libdir)/$$file; \ diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD index 3ca26ac6a..119cf4705 100644 --- a/main/gnumeric/APKBUILD +++ b/main/gnumeric/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnumeric -pkgver=1.12.3 +pkgver=1.12.4 pkgrel=0 pkgdesc="A GNOME Spreadsheet Program" url="http://www.gnome.org/projects/gnumeric/" arch="all" license="GPL" -makedepends="gtk+3.0-dev intltool desktop-file-utils libglade-dev goffice-dev - rarian" +makedepends="gtk+3.0-dev intltool desktop-file-utils goffice-dev rarian + python-dev py-gobject3-dev" install= subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.12/$pkgname-$pkgver.tar.xz" @@ -27,9 +27,9 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-schemas-install \ --disable-static \ - --enable-ssindex || return 1 + --with-python \ + || return 1 make itlocaledir="/usr/share/locale" || return 1 } @@ -41,6 +41,6 @@ package() { "$pkgdir"/usr/lib/*/*/plugins/*/*.la } -md5sums="52d0637252930a5390adeb4e7ad27966 gnumeric-1.12.3.tar.xz" -sha256sums="b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6 gnumeric-1.12.3.tar.xz" -sha512sums="f3591db341d378979eef4de5eeae0f9b7035940d46ff0876ad7cc038879a722541b098520f60078f83c47280870a0c6b90369a03394d05adcdcc10b0e072a15c gnumeric-1.12.3.tar.xz" +md5sums="0ec8e9902245fc099ca985ece80e48af gnumeric-1.12.4.tar.xz" +sha256sums="562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd gnumeric-1.12.4.tar.xz" +sha512sums="58ae4015a8c7fbef1fc8675092ed8f3997091cd7efb579db402d253b0bbb61f1445d97f84e5bda864698f96a25f979c82ced338d5d2c887b20d31d131a8c4884 gnumeric-1.12.4.tar.xz" diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD index c858a4b35..961a1086b 100644 --- a/main/goffice/APKBUILD +++ b/main/goffice/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=goffice -pkgver=0.10.3 +pkgver=0.10.4 pkgrel=0 _maj=${pkgver%%.*} _min=${pkgver#${_maj}.} @@ -42,9 +42,9 @@ package() { rm -f "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/goffice/*/plugins/*/*.la } -md5sums="959e906d337b4dfe98f678ae51c8a1ef goffice-0.10.3.tar.xz +md5sums="93f06f8ee70d2601b158762b0a543927 goffice-0.10.4.tar.xz 0d9a3666263a57c43574b89b638a6503 localedir.patch" -sha256sums="1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2 goffice-0.10.3.tar.xz +sha256sums="30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba goffice-0.10.4.tar.xz 05bfe0446d29ae7dd443600a58d172d1bb4f3d1d24886e785dfcc108c2d0e8ce localedir.patch" -sha512sums="74fb3ea950b72b52061fe5fdb0d7d2b65eb38128358be4d37c4a03361839f60cbe0989d31e0fe2300466b058cb5a83e4d28b4e75f83739a9dc46e2d4816046e1 goffice-0.10.3.tar.xz +sha512sums="fcfe34c8e2bd9c35e1b50fe504b6c9a52bfc6256969e21fabd9a8ca0a49e6d76e88d107959964b082dcaa9b90b8db642912082e2faf9bb1dd93ac70804afb4ee goffice-0.10.4.tar.xz 4e1138f1ec2e4f2d1eb85df653542195aa9caf512c759c54f6b275750a819d9684f590e0c8c01203050c1b3901f57ac6e113649f05ddc09b4d782307fd4e58d6 localedir.patch" diff --git a/main/goffice0.8/APKBUILD b/main/goffice0.8/APKBUILD index 9a2ec0064..54829f2cd 100644 --- a/main/goffice0.8/APKBUILD +++ b/main/goffice0.8/APKBUILD @@ -25,7 +25,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - libtoolize --force && aclocal && autoconf && automake + libtoolize --force && aclocal && autoconf && automake --add-missing } build() { diff --git a/main/gst-libav1/APKBUILD b/main/gst-libav1/APKBUILD index f9b8e5e1e..685fe007d 100644 --- a/main/gst-libav1/APKBUILD +++ b/main/gst-libav1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-libav1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Gstreamer libav Plugin" url="http://www.gstreamer.net" @@ -41,6 +41,6 @@ package() { find "$pkgdir"/usr/lib/ \( -name '*.la' -o -name '*.a' \) -delete } -md5sums="68e1eb18a58907e21b81d26ce7db056a gst-libav-1.0.7.tar.xz" -sha256sums="aefa679d14e7a6558673cfbf401b9c01f1903bb52e5dc08332e9001d25a7ba7a gst-libav-1.0.7.tar.xz" -sha512sums="aefe99e7acab056a3eea6051cd5b22acd660e94503e12b008e67ae6fd92e2b7a121e1d6e15616bf30ea40e28dabc0ba63359293f50bdd9d40a2081017167d1fb gst-libav-1.0.7.tar.xz" +md5sums="7c2e8db039efa1880a61a6982a6909d7 gst-libav-1.0.8.tar.xz" +sha256sums="e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f gst-libav-1.0.8.tar.xz" +sha512sums="282b40320f7b17ba60a660a743b89b98368eaec781cc3455226df2e5db5f9ec76b5a8e2fb1c16c05fd231cc1d891b9686a950ebc8c09d352675e82edf6e357ae gst-libav-1.0.8.tar.xz" diff --git a/main/gst-plugins-bad1/APKBUILD b/main/gst-plugins-bad1/APKBUILD index 91760a820..2a758e9aa 100644 --- a/main/gst-plugins-bad1/APKBUILD +++ b/main/gst-plugins-bad1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-bad1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="GStreamer bad plugins" url="http://gstreamer.freedesktop.org/" @@ -58,6 +58,6 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="d1493d1219b836a8cbf54f4fba962420 gst-plugins-bad-1.0.7.tar.xz" -sha256sums="5f49e6353fdc855834b5beb054b3a47ef5fa558006c7eda6d2ec07b36315c2ab gst-plugins-bad-1.0.7.tar.xz" -sha512sums="b2f0f6f2bf1bb4878bbff2bee2ebbd5c07b0f071be34cb795a37c641985721da9c4152fabadbdbb3833c67795a729a0c3088f7ac53162db4944b113e24ff5f79 gst-plugins-bad-1.0.7.tar.xz" +md5sums="a2fdf125ee2ae46047dcbcfc305949ee gst-plugins-bad-1.0.8.tar.xz" +sha256sums="6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc gst-plugins-bad-1.0.8.tar.xz" +sha512sums="6236a4e86fb6a79041535a6d5658150fc3260e165c12b62b406f66267c80a6d77dcefb2eec254b56dbb06aa8fd72941d8e3cb073afaa6d45149d1872b830383f gst-plugins-bad-1.0.8.tar.xz" diff --git a/main/gst-plugins-base1/APKBUILD b/main/gst-plugins-base1/APKBUILD index d95534bcd..4b1de23e7 100644 --- a/main/gst-plugins-base1/APKBUILD +++ b/main/gst-plugins-base1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-base1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="GStreamer Multimedia Framework Base Plugins" url="http://gstreamer.freedesktop.org/" @@ -57,6 +57,6 @@ package() { "$pkgdir"/usr/lib/gstreamer*/*.a } -md5sums="b5b43cfbf82b413ce2e07a190d87e68f gst-plugins-base-1.0.7.tar.xz" -sha256sums="014805e50b696bc06c3862ea656df079fc0b5fef0c10f16e9f085f290545677a gst-plugins-base-1.0.7.tar.xz" -sha512sums="c5346b00d4c71aa71fca30e4feb6e5859d62a756de8b3e1f96953b9287712610b72aa25bffa145aea27e064874469c8f54e9dfb938e692e9b26460ba4698e313 gst-plugins-base-1.0.7.tar.xz" +md5sums="c8b36678186e7d4fb1e6395ffcd1abb1 gst-plugins-base-1.0.8.tar.xz" +sha256sums="b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d gst-plugins-base-1.0.8.tar.xz" +sha512sums="f289b266a9eb3fdf7b9667496dc251ebd8ea5f5a4463264f3b8ff5233a128c5dffcf7e6501e38169e00a0f6a471d12fe399bd0fd2facdadafd4089ef2d077788 gst-plugins-base-1.0.8.tar.xz" diff --git a/main/gst-plugins-good1/APKBUILD b/main/gst-plugins-good1/APKBUILD index ce780265c..a119a4810 100644 --- a/main/gst-plugins-good1/APKBUILD +++ b/main/gst-plugins-good1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-good1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="http://gstreamer.freedesktop.org/" @@ -69,6 +69,6 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="e4b1c825475a9b478fe29e8e9f34516f gst-plugins-good-1.0.7.tar.xz" -sha256sums="a016a3b377c86658627aef902b9204108209100b2e88fcc3b695c392af1b4035 gst-plugins-good-1.0.7.tar.xz" -sha512sums="b3d374d83a337792eb612794524e9a860ee0e382e57a41abeec8018885f2c5521e04fc5966e91bb17d21ec12d44d972202e3295377c0c958a354e1ed6208d5c0 gst-plugins-good-1.0.7.tar.xz" +md5sums="4969826043bbd3f76e4a0d49ea475736 gst-plugins-good-1.0.8.tar.xz" +sha256sums="97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad gst-plugins-good-1.0.8.tar.xz" +sha512sums="a3702513341e53ed0f5aeda889e21696f14e3c5664514468e15aecd8d831d99942de5f1bfc7f1e1dd9e40d5414231e8c073b348e6ce6be4c4e4d46244522d0b3 gst-plugins-good-1.0.8.tar.xz" diff --git a/main/gst-plugins-ugly1/APKBUILD b/main/gst-plugins-ugly1/APKBUILD index 48378cd1d..6430d0a06 100644 --- a/main/gst-plugins-ugly1/APKBUILD +++ b/main/gst-plugins-ugly1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" url="http://gstreamer.freedesktop.org/" @@ -45,6 +45,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } -md5sums="8754edf6c3be235f232fb75ad11708bb gst-plugins-ugly-1.0.7.tar.xz" -sha256sums="b78b8cfabe322497da432a0f297dbb21862a033f95e8d4cd8f207eccb5288f2b gst-plugins-ugly-1.0.7.tar.xz" -sha512sums="8d6c3ce19c67a3fe428ca63fab8dae0db5d8413ba86ed7f36ff59a0894086aa53574fa0477a611378f53a0c2fa27e45c53d24a6a264a3b2e0d884991c6fe246b gst-plugins-ugly-1.0.7.tar.xz" +md5sums="67fd24035eccee556ed9e89d75447d94 gst-plugins-ugly-1.0.8.tar.xz" +sha256sums="58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84 gst-plugins-ugly-1.0.8.tar.xz" +sha512sums="353d458a145a7703473ecd41fec200b0996917febff3d368ef121472b9af7588533456a2e00a3dbc20df871a724448aca66be87ab67f259b106994b4dd3dd00b gst-plugins-ugly-1.0.8.tar.xz" diff --git a/main/gstreamer1/APKBUILD b/main/gstreamer1/APKBUILD index d894a9ebf..59df186f6 100644 --- a/main/gstreamer1/APKBUILD +++ b/main/gstreamer1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gstreamer1 -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="GStreamer Multimedia Framework" url="http://gstreamer.freedesktop.org/" @@ -55,6 +55,6 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="8f6066a37c71a0d0ff5fe5f7687fea12 gstreamer-1.0.7.tar.xz" -sha256sums="68cada7ee24ede23e15dc81ccde11898eed1a7a3c6a2d81a8c31596fccb1b5ce gstreamer-1.0.7.tar.xz" -sha512sums="6e129cafcabd412026f9ff40e475a383406ad8eb9de5020310a1f98d0fea44a3ae69f8d285745f7a42e91f96d3d4c55ea706b497a35008bbab206fa71a17997a gstreamer-1.0.7.tar.xz" +md5sums="fb0c73470e8dd5dab01e5e9e62db9db9 gstreamer-1.0.8.tar.xz" +sha256sums="ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d gstreamer-1.0.8.tar.xz" +sha512sums="17b19383a535564a0e8f5d5792e52dfae359ce1c9f55b09321fbc5c9f5be4c41c1957f70d987a4812ec7d97f2f5cda77339163d928e5b5ff2c334c0bf6c804c3 gstreamer-1.0.8.tar.xz" diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD index 65f2de90d..b2f62b9ca 100644 --- a/main/harfbuzz/APKBUILD +++ b/main/harfbuzz/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=harfbuzz pkgver=0.9.18 -pkgrel=0 +pkgrel=1 pkgdesc="Text shaping library" url="http://freedesktop.org/wiki/Software/HarfBuzz" arch="all" @@ -10,7 +10,7 @@ depends="" depends_dev="" makedepends="$depends_dev freetype-dev glib-dev cairo-dev icu-dev" install="" -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-icu" source="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$pkgver.tar.bz2" _builddir="$srcdir"/harfbuzz-$pkgver @@ -43,6 +43,13 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } +icu() { + pkgdesc="Harfbuzz ICU support library" + replaces="harfbuzz" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ +} + md5sums="0bff05fafef4894031b2b64a65ac1899 harfbuzz-0.9.18.tar.bz2" sha256sums="fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908 harfbuzz-0.9.18.tar.bz2" sha512sums="cf873e903b620391efbd681a01620f1719d278bf10a61a8f583abb9ba116ec494459cef1f81f137cf2dbb089c9d6a8460576ccabd46ab3f23a50e3731b427f5d harfbuzz-0.9.18.tar.bz2" diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD index 370877209..45de772a2 100644 --- a/main/lame/APKBUILD +++ b/main/lame/APKBUILD @@ -32,7 +32,7 @@ prepare() { # fix for pic build with new nasm sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || return 1 - aclocal && automake || return 1 + aclocal && automake --add-missing || return 1 } build() { diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD index 09316dbb5..410baf91c 100644 --- a/main/libedit/APKBUILD +++ b/main/libedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libedit -pkgver=3.0 +pkgver=3.1 pkgrel=0 pkgdesc="netbsd line editing library" url="http://www.thrysoee.dk/editline/" @@ -12,9 +12,9 @@ depends_dev="ncurses-dev" makedepends="$depends_dev" install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.thrysoee.dk/editline/libedit-20120601-$pkgver.tar.gz" +source="http://www.thrysoee.dk/editline/libedit-20130712-$pkgver.tar.gz" -_builddir="$srcdir"/libedit-20120601-$pkgver +_builddir="$srcdir"/libedit-20130712-$pkgver prepare() { local i cd "$_builddir" @@ -42,4 +42,6 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="e50f6a7afb4de00c81650f7b1a0f5aea libedit-20120601-3.0.tar.gz" +md5sums="0891336c697362727a1fa7e60c5cb96c libedit-20130712-3.1.tar.gz" +sha256sums="5d9b1a9dd66f1fe28bbd98e4d8ed1a22d8da0d08d902407dcc4a0702c8d88a37 libedit-20130712-3.1.tar.gz" +sha512sums="9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e libedit-20130712-3.1.tar.gz" diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index da56c5085..65a8bc0cf 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=llvm -pkgver=3.2 -pkgrel=4 +pkgver=3.3 +pkgrel=0 pkgdesc="low level virtual machine compiler system" arch="x86 x86_64" url="http://llvm.org/" @@ -13,8 +13,8 @@ makedepends="$depends_dev groff libffi-dev python chrpath" install= subpackages="clang $pkgname-dev $pkgname-doc $pkgname-libs" source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz - llvm-3.2-alpine-linux.patch + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz + llvm-3.3-alpine-linux.patch " # clang hardcodes linker paths; and don't know of a fix like the --with-dynamic-linker # patch we use for gcc. So llvm-3.2-alpine-linux.patch needs to be updated if/when the @@ -28,7 +28,7 @@ prepare() { msg "Preparing CLANG sources..." - mv "$srcdir"/clang-$pkgver.src \ + mv "$srcdir"/cfe-$pkgver.src \ "$srcdir"/$pkgname-$pkgver.src/tools/clang || return 1 msg "Patching LLVM core..." @@ -43,6 +43,8 @@ prepare() { ;; esac done + # fails to link + rm ./unittests/Support/formatted_raw_ostream_test.cpp } build() { @@ -105,12 +107,12 @@ libs() { mv "$pkgdir"/usr/lib/*.so "$subpkgdir"/usr/lib/ } -md5sums="71610289bbc819e3e15fdd562809a2d7 llvm-3.2.src.tar.gz -3896ef4334df08563b05d0848ba80582 clang-3.2.src.tar.gz -3014842ee498ffe044773ef3a7f859ca llvm-3.2-alpine-linux.patch" -sha256sums="125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 llvm-3.2.src.tar.gz -2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658 clang-3.2.src.tar.gz -0496f84b97131b393662f4031bf7e117caaa29702bea569e8d4d783093c3067f llvm-3.2-alpine-linux.patch" -sha512sums="cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc llvm-3.2.src.tar.gz -99fc57d19b76c42af9821eaaa762056a926eb68178f6b7dd5e8bf092c9ee201a554b91d760d5a30a57f38102eae340e080ef8c6a39327f6881eda391b20b108d clang-3.2.src.tar.gz -3878cfff1ab702c275d47b831751d87b2a112223ea6fe1fcc30e5f8e06b2fedf4f07b8ca9c65b3e6ac35dc6feba8d91a8b0579f9b2fe194ccdb202c2b9338640 llvm-3.2-alpine-linux.patch" +md5sums="40564e1dc390f9844f1711c08b08e391 llvm-3.3.src.tar.gz +8284891e3e311829b8e44ac813d0c9ef cfe-3.3.src.tar.gz +5d5f4da3582349c9a8626cf55f8ac5e4 llvm-3.3-alpine-linux.patch" +sha256sums="68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 llvm-3.3.src.tar.gz +b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 cfe-3.3.src.tar.gz +4c9a6b6838585ffe8d5ea063a1fa51514d407f9bb32ad56e859ed30c612fa641 llvm-3.3-alpine-linux.patch" +sha512sums="1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038 llvm-3.3.src.tar.gz +06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc cfe-3.3.src.tar.gz +4c177652bca81168e70ed37f95b337eea0fc4ad17ca8a5d77a018124aad89c06f851b92b9c89708b616fa37404a4a26f002dc035f6d4d7e22d97369d3fe71a95 llvm-3.3-alpine-linux.patch" diff --git a/main/llvm/llvm-3.2-alpine-linux.patch b/main/llvm/llvm-3.3-alpine-linux.patch index ecde9e283..496497327 100644 --- a/main/llvm/llvm-3.2-alpine-linux.patch +++ b/main/llvm/llvm-3.3-alpine-linux.patch @@ -1,7 +1,8 @@ -diff -urp llvm-3.2.src.orig/include/llvm/ADT/Triple.h llvm-3.2.src.new/include/llvm/ADT/Triple.h ---- llvm-3.2.src.orig/include/llvm/ADT/Triple.h 2012-11-15 16:24:48.000000000 -0500 -+++ llvm-3.2.src.new/include/llvm/ADT/Triple.h 2013-04-22 04:02:00.691571066 -0400 -@@ -115,7 +115,8 @@ public: +diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h +index 3a72e87..ac4c3ea 100644 +--- a/include/llvm/ADT/Triple.h ++++ b/include/llvm/ADT/Triple.h +@@ -117,7 +117,8 @@ public: EABI, MachO, Android, @@ -11,10 +12,11 @@ diff -urp llvm-3.2.src.orig/include/llvm/ADT/Triple.h llvm-3.2.src.new/include/l }; private: -diff -urp llvm-3.2.src.orig/lib/Support/Triple.cpp llvm-3.2.src.new/lib/Support/Triple.cpp ---- llvm-3.2.src.orig/lib/Support/Triple.cpp 2012-11-15 16:24:48.000000000 -0500 -+++ llvm-3.2.src.new/lib/Support/Triple.cpp 2013-04-22 04:02:04.568319294 -0400 -@@ -147,6 +147,7 @@ const char *Triple::getEnvironmentTypeNa +diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp +index 412e34c..64dfce8 100644 +--- a/lib/Support/Triple.cpp ++++ b/lib/Support/Triple.cpp +@@ -151,6 +151,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) { case MachO: return "macho"; case Android: return "android"; case ELF: return "elf"; @@ -22,7 +24,7 @@ diff -urp llvm-3.2.src.orig/lib/Support/Triple.cpp llvm-3.2.src.new/lib/Support/ } llvm_unreachable("Invalid EnvironmentType!"); -@@ -293,6 +294,7 @@ static Triple::EnvironmentType parseEnvi +@@ -300,6 +301,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) { .StartsWith("macho", Triple::MachO) .StartsWith("android", Triple::Android) .StartsWith("elf", Triple::ELF) @@ -30,10 +32,11 @@ diff -urp llvm-3.2.src.orig/lib/Support/Triple.cpp llvm-3.2.src.new/lib/Support/ .Default(Triple::UnknownEnvironment); } -diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.2.src.new/tools/clang/lib/Driver/ToolChains.cpp ---- llvm-3.2.src.orig/tools/clang/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 -+++ llvm-3.2.src.new/tools/clang/lib/Driver/ToolChains.cpp 2013-04-22 04:02:08.788408080 -0400 -@@ -1070,7 +1070,8 @@ Generic_GCC::GCCInstallationDetector::GC +diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp +index fffba0e..797d0c1 100644 +--- a/tools/clang/lib/Driver/ToolChains.cpp ++++ b/tools/clang/lib/Driver/ToolChains.cpp +@@ -1099,7 +1099,8 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector( "x86_64-suse-linux", "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", @@ -43,7 +46,7 @@ diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.2.src.n }; static const char *const X86LibDirs[] = { "/lib32", "/lib" }; static const char *const X86Triples[] = { -@@ -1083,7 +1084,8 @@ Generic_GCC::GCCInstallationDetector::GC +@@ -1113,7 +1114,8 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector( "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux", @@ -53,15 +56,15 @@ diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.2.src.n }; static const char *const MIPSLibDirs[] = { "/lib" }; -@@ -1829,6 +1831,7 @@ Tool &Solaris::SelectTool(const Compilat - /// Linux toolchain (very bare-bones at the moment). +@@ -1980,6 +1982,7 @@ Tool *Solaris::buildLinker() const { + /// Distribution (very bare-bones at the moment). - enum LinuxDistro { + enum Distro { + AlpineLinux, ArchLinux, DebianLenny, DebianSqueeze, -@@ -1955,6 +1958,9 @@ static LinuxDistro DetectLinuxDistro(llv +@@ -2109,6 +2112,9 @@ static Distro DetectDistro(llvm::Triple::ArchType Arch) { if (!llvm::sys::fs::exists("/etc/arch-release", Exists) && Exists) return ArchLinux; @@ -71,28 +74,29 @@ diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/ToolChains.cpp llvm-3.2.src.n return UnknownDistro; } -diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/Tools.cpp llvm-3.2.src.new/tools/clang/lib/Driver/Tools.cpp ---- llvm-3.2.src.orig/tools/clang/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 -+++ llvm-3.2.src.new/tools/clang/lib/Driver/Tools.cpp 2013-04-22 04:09:34.657814569 -0400 -@@ -5975,9 +5975,12 @@ void linuxtools::Link::ConstructJob(Comp +diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp +index aba1fe4..cc8e9c9 100644 +--- a/tools/clang/lib/Driver/Tools.cpp ++++ b/tools/clang/lib/Driver/Tools.cpp +@@ -5983,9 +5983,12 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-dynamic-linker"); if (isAndroid) CmdArgs.push_back("/system/bin/linker"); - else if (ToolChain.getArch() == llvm::Triple::x86) - CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || +- else if (ToolChain.getArch() == llvm::Triple::aarch64) + else if (ToolChain.getArch() == llvm::Triple::x86) { + if (ToolChain.getTriple().getEnvironment() == llvm::Triple::UClibc) + CmdArgs.push_back("/lib/ld-uClibc.so.0.9.32"); + else + CmdArgs.push_back("/lib/ld-linux.so.2"); -+ } else if (ToolChain.getArch() == llvm::Triple::arm || ++ } else if (ToolChain.getArch() == llvm::Triple::aarch64) + CmdArgs.push_back("/lib/ld-linux-aarch64.so.1"); + else if (ToolChain.getArch() == llvm::Triple::arm || ToolChain.getArch() == llvm::Triple::thumb) { - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) - CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -@@ -5998,6 +6001,8 @@ void linuxtools::Link::ConstructJob(Comp - CmdArgs.push_back("/lib/ld.so.1"); - else if (ToolChain.getArch() == llvm::Triple::ppc64) +@@ -6009,6 +6012,8 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, + else if (ToolChain.getArch() == llvm::Triple::ppc64 || + ToolChain.getArch() == llvm::Triple::systemz) CmdArgs.push_back("/lib64/ld64.so.1"); + else if (ToolChain.getTriple().getEnvironment() == llvm::Triple::UClibc) + CmdArgs.push_back("/lib/ld64-uClibc.so.0.9.32"); diff --git a/main/lua-signal/APKBUILD b/main/lua-signal/APKBUILD index 2c9f10576..31fe5768f 100644 --- a/main/lua-signal/APKBUILD +++ b/main/lua-signal/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=lua-signal pkgver=1.200 -pkgrel=0 +pkgrel=1 pkgdesc="Signal library for Lua" url=http://www.batbytes.com/files/ arch=all license=MIT -depends=lua +depends= makedepends=lua-dev install="" -source=${url}lua-signal-${pkgver}.tar.gz +source="http://dev.alpinelinux.org/archive/lua-signal/lua-signal-${pkgver}.tar.gz" _builddir=$srcdir/lua-signal prepare() { diff --git a/main/lua-sleep/APKBUILD b/main/lua-sleep/APKBUILD index 22d135483..e57faea05 100644 --- a/main/lua-sleep/APKBUILD +++ b/main/lua-sleep/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=lua-sleep pkgver=0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Sleep functions for Lua" url=http://projects.plentyfact.org/projects/lua-sleep arch=all license=public-domain -depends=lua +depends= makedepends=lua-dev -source=http://projects.plentyfact.org/attachments/download/21/lua-sleep_${pkgver}.tar.gz +source="http://dev.alpinelinux.org/archive/lua-sleep/lua-sleep_$pkgver.tar.gz" _builddir=$srcdir/lua-sleep_$pkgver prepare() { diff --git a/main/perl-date-manip/APKBUILD b/main/perl-date-manip/APKBUILD index c4d8f4246..78eb46943 100644 --- a/main/perl-date-manip/APKBUILD +++ b/main/perl-date-manip/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-date-manip _pkgreal=Date-Manip -pkgver=6.39 +pkgver=6.40 pkgrel=0 pkgdesc="Date manipulation routines" url="http://search.cpan.org/dist/Date-Manip/" @@ -35,6 +35,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="dd91d884b5ff044134c2870b1de678c9 Date-Manip-6.39.tar.gz" -sha256sums="78a531bbc04029795f21f780421f8551e5fa6cac53802a962bfb110b0bbbe2a0 Date-Manip-6.39.tar.gz" -sha512sums="1d4c0a3d997f623686acb5689458e78f023c608fc59d47b8bbf582470a144a84d043f7e1c9768f9191d4418e4c1195bc850a64ee84982c0ef1b0ee266680167d Date-Manip-6.39.tar.gz" +md5sums="ae57b05e8ec689de2f23c99639e0109d Date-Manip-6.40.tar.gz" +sha256sums="a18d0beab9cfb2d99978daa93897686502fee9a2108f26f6229969110197c07a Date-Manip-6.40.tar.gz" +sha512sums="9e8e618e1afdf12dfa098a9a4745b4dfb75667ca2e77dc8e1b0d8b102ff3d50cd2979897dbf6f77be2c1016f24fe9717bfc69917b173f5f6d22982777b46bb25 Date-Manip-6.40.tar.gz" diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD index 8c028c928..33fa56032 100644 --- a/main/popt/APKBUILD +++ b/main/popt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=popt pkgver=1.16 -pkgrel=4 +pkgrel=5 pkgdesc="A commandline option parser" url="http://rpm5.org" arch="all" @@ -16,6 +16,7 @@ build () cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --libdir=/lib \ + --disable-static \ || return 1 make || return 1 } @@ -26,10 +27,4 @@ package() { rm -f "$pkgdir"/lib/*.la } -dev() { - default_dev - mkdir -p "$subpkgdir"/lib/ - mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ -} - md5sums="3743beefa3dd6247a73f8f7a32c14c33 popt-1.16.tar.gz" diff --git a/main/sngtc_client/APKBUILD b/main/sngtc_client/APKBUILD index d0f9dbf6b..b9864615f 100644 --- a/main/sngtc_client/APKBUILD +++ b/main/sngtc_client/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sngtc_client -pkgver=1.3.2 -pkgrel=1 +pkgver=1.3.4.1 +pkgrel=0 pkgdesc="Sangoma Media Transcode client and lib" url="http://wiki.sangoma.com/Transcoding-distributed-install" arch="all" @@ -16,7 +16,8 @@ subpackages="$pkgname-dev" # be equal on both i686 an x86_64 so we just pick i686 package for all # our archs. source="ftp://ftp.sangoma.com/linux/transcoding/sng-tc-linux-$pkgver.i686.tgz - sngtc_client-dynamic-ortp.patch" + sngtc_client-dynamic-ortp.patch + ortp.patch" _builddir="$srcdir"/sng-tc-linux-$pkgver.i686 prepare() { @@ -44,5 +45,12 @@ package() { cp server/libsngtc/*.h "$pkgdir"/usr/include/sng_tc/ } -md5sums="6db4f71d2cd798f7802b71300d476e5a sng-tc-linux-1.3.2.i686.tgz -2c6b702af7ec9adc144823000012336c sngtc_client-dynamic-ortp.patch" +md5sums="eff04cdee73ee930a96c87977b21abb1 sng-tc-linux-1.3.4.1.i686.tgz +2c6b702af7ec9adc144823000012336c sngtc_client-dynamic-ortp.patch +e9c6076ba8fb08ac680e92df1feb7795 ortp.patch" +sha256sums="04de3559832ed139d553ebb3b48dd7e25bd4ba75a58e3fc829f8dcd78a2cedcb sng-tc-linux-1.3.4.1.i686.tgz +7b1ce78357184e58073b010c1074866bdeefe855aeda204793f476274ad0beed sngtc_client-dynamic-ortp.patch +e22f77b4ce280e2c436143eab8a7170eaee7a21ef393b5be655181ab2efa5587 ortp.patch" +sha512sums="c80470540c7f7f3b15f027a49a248ad0f0dd9088b71520c63e0bd57fa6e34531ff944bb962eb0d4ed78285dbc408c09dcbd7122c48a7af7d4ce46c03d0d19c20 sng-tc-linux-1.3.4.1.i686.tgz +2b784c56d1482ad9069502c408138d0c0b0ea6b393902d45b09200a3a588e02138c21a1fbee4d5715711e578130c30c607cae59f7ee24b8ce5bccd5a9c2fce14 sngtc_client-dynamic-ortp.patch +33163306a2207e70a9a8535d6b1ca9706d44e5076a570525db15c47c6aeb6f58e035bfec4826f8763422a505acdad5cfa7b59c60b544f681ad319d26d75d2977 ortp.patch" diff --git a/main/sngtc_client/ortp.patch b/main/sngtc_client/ortp.patch new file mode 100644 index 000000000..d8d746388 --- /dev/null +++ b/main/sngtc_client/ortp.patch @@ -0,0 +1,13 @@ +diff --git a/client/sngtc_client/sngtc_client.c b/client/sngtc_client/sngtc_client.c +index b01c106..bfc504a 100644 +--- a/client/sngtc_client/sngtc_client.c ++++ b/client/sngtc_client/sngtc_client.c +@@ -714,7 +714,7 @@ static int create_rtp_socket(void *usr_priv, sngtc_codec_request_leg_t *codec_re + + rtp_session_set_blocking_mode(session, FALSE); + +- rtp_session_set_local_addr(session, globals.bindip_str, local_port); ++ rtp_session_set_local_addr(session, globals.bindip_str, local_port, local_port+1); + + rtp_session_set_connected_mode(session, TRUE); + diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index d9a84f2f7..1d5f12fc5 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=squid -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=0 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" @@ -105,21 +105,21 @@ squid_kerb_auth() { mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ } -md5sums="269013bb77cf0c3d771f8590145272f0 squid-3.3.7.tar.bz2 +md5sums="ec1654d28e29bdd2ee342ffb655ecc72 squid-3.3.8.tar.bz2 16e3b38996d4c5858e1478f8eb650876 squid-3.2.0.16-loggable-urlgroup.patch 473f8f6dabaec2bd73134d8288deea3d cf_gen-pthread.patch 9e71076799d334faba6f4954594e7b4a bug-3679.patch 905e57c6d41414f54a75a5c0f9f7fac7 squid.initd 2897c725c201be53d3c9a7db0101bdf0 squid.confd 58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" -sha256sums="9b974685e5b9d1c8de532ce375b4aaaf55d0faa8ecf5c929305f9f7ca07977c1 squid-3.3.7.tar.bz2 +sha256sums="6411f344510e780f9e579851151278e1d02d8fe06a56abb1d97b1c53c61326a1 squid-3.3.8.tar.bz2 9963c0f0ef96522d8cbb3379f119635d2b4df0796589211d91f6705935a835d5 squid-3.2.0.16-loggable-urlgroup.patch 3b05ebd2d4baeb0e01437de768c8fbe76ff446f126d107b73fad6bd0d1968f0c cf_gen-pthread.patch 6b08cd129ea5fef019c78f1818c628e1070fe767e362da14844396b671f5a18d bug-3679.patch 3e5786304f218aecd5c01fa4b81aa05092ee3c7652d914b01112222fb5b2796e squid.initd ec2a9f3308129354783c5088fb37148eda102fe9397fb7bbe90243d9223ee2e1 squid.confd b6efdb3261c2e4b5074ef49160af8b96e65f934c7fd64b8954df48aa41cd9b67 squid.logrotate" -sha512sums="484354fcabadc832946e5fc2a91ce255fdd578d288014060f738530abd5f4e11b392b34050ed37f6fefcb4353a29711742b400eead24ce61f3cd692248599a55 squid-3.3.7.tar.bz2 +sha512sums="5f47078785a2ec936cc9842638dc8342aed43f94984de68e9ed973e2eab77847f668f2acfb9dc65ffad88cc5b1f1a3831454b4904d8122b2fc8d5d8d18f8f12b squid-3.3.8.tar.bz2 1ab18ed43225fcca95f6c2e1554524bfee805f4894d5342acbdcd9faa6dcad5f310ed4ea01c9131f9729197e27399649b62a95666cb4564e30d8b0904f0f1b75 squid-3.2.0.16-loggable-urlgroup.patch c5a230fe1f4dda8a3ab064f07c2b93a6f6e3ebdf290cb45da262300d06ac28aa4470a80c8f14db5c9ff4dcc478933d9882bef638a566fe8ad66aec1f96f80be3 cf_gen-pthread.patch b477397f205ba207502a42aae674c85cad85eec831158ea0834361d98ef09a0f103d7a847e101bdd0ece73bbdda9b545960edd5385042bd593733810977e292a bug-3679.patch diff --git a/testing/bluez5/APKBUILD b/testing/bluez5/APKBUILD new file mode 100644 index 000000000..1f072ae77 --- /dev/null +++ b/testing/bluez5/APKBUILD @@ -0,0 +1,75 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=bluez5 +pkgver=5.7 +pkgrel=0 +pkgdesc="Tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch="all" +license="GPL2" +depends="consolekit dbus" +replaces="udev" +makedepends="dbus-dev libusb-compat-dev udev-dev + libical-dev readline-dev glib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-cups + $pkgname-hid2hci" +source="http://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.bz2 + bluetooth.initd + rfcomm.initd + rfcomm.confd + " + +_builddir="$srcdir"/bluez-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --disable-systemd \ + --enable-library \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install DESTDIR="$pkgdir" || return 1 + rm "$pkgdir"/usr/lib/*.la || return 1 + install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth + install -Dm755 "$srcdir"/rfcomm.initd "$pkgdir"/etc/init.d/rfcomm + install -Dm644 "$srcdir"/rfcomm.confd "$pkgdir"/etc/conf.d/rfcomm + install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent +} + +libs() { + pkgdesc="Libraries for Bluetooth protocol stack" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libbluetooth.so.* "$subpkgdir"/usr/lib/ +} + +cups() { + pkgdesc="Bluez backend for CUPS" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/ +} + +hid2hci() { + pkgdesc="Put HID proxying bluetooth HCI's into HCI mode" + replaces="bluez" + mkdir -p "$subpkgdir" + mv "$pkgdir"/lib "$subpkgdir"/ +} + +md5sums="eb883ce61753bd3f300a531bcc2af49e bluez-5.7.tar.bz2 +833746cfe1c4f8188a8cd03f157b4a93 bluetooth.initd +7672edb8e33c4495ee9febb9864feb10 rfcomm.initd +7f4bb093adb0f519c621f2ea68712f35 rfcomm.confd" +sha256sums="8db8b024e3edd897b30290134ad02920ad42f6cb0f93fcd6f7057672a4e28f7d bluez-5.7.tar.bz2 +b637eeb3ddc4143fac2510ff2f3f192f8d853d421d495f063953050838bc13a2 bluetooth.initd +4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e rfcomm.initd +672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 rfcomm.confd" +sha512sums="edce3504708ad5e5717941c668bc285c17c5ccc5dea82881d2e9d25fe266f98294dacf0e79d4ca4a68ffb204c328fef75d4cdab1b4f4750156ccdc5b9662e2a3 bluez-5.7.tar.bz2 +69b4834b07124eef32712a92d20b2ac865cfb48c43ec3895edb270b258189013a82758c3fc76faa12735ba8d04b1e77f95cf1322b1c7332a04c3d9621376936f bluetooth.initd +8f14b4e05c9ecaf4586ed2fdc2d2519de6b613de62ae5c95508baa682630f3112c5b6db6850f76679afc49e06f2ad035d148fa30b9b980747b6fb423f7bebe88 rfcomm.initd +a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd" diff --git a/testing/bluez5/bluetooth.initd b/testing/bluez5/bluetooth.initd new file mode 100644 index 000000000..23426b7c8 --- /dev/null +++ b/testing/bluez5/bluetooth.initd @@ -0,0 +1,11 @@ +#!/sbin/runscript + +name="Bluetooth" +command="/usr/lib/bluetooth/bluetoothd" + + +depend() { + after coldplug + need dbus localmount +} + diff --git a/testing/bluez5/rfcomm.confd b/testing/bluez5/rfcomm.confd new file mode 100644 index 000000000..d87acdb28 --- /dev/null +++ b/testing/bluez5/rfcomm.confd @@ -0,0 +1,5 @@ +# Bind rfcomm devices (allowed values are "true" and "false") +RFCOMM_ENABLE=true + +# Config file for rfcomm +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/testing/bluez5/rfcomm.initd b/testing/bluez5/rfcomm.initd new file mode 100644 index 000000000..d3b819e1a --- /dev/null +++ b/testing/bluez5/rfcomm.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.1 2011/12/31 21:09:18 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then + if [ -f "${RFCOMM_CONFIG}" ]; then + ebegin "Starting rfcomm" + /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all + eend $? + else + ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" + fi + fi +} + +stop() { + ebegin "Shutting down rfcomm" + /usr/bin/rfcomm release all + eend $? +} diff --git a/testing/libreswan/APKBUILD b/testing/libreswan/APKBUILD index ba2a5b93a..c069ac8f5 100644 --- a/testing/libreswan/APKBUILD +++ b/testing/libreswan/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libreswan -pkgver=3.3 +pkgver=3.5 pkgrel=0 pkgdesc='IPsec implementation for Linux' url='https://libreswan.org/' @@ -32,9 +32,9 @@ package() { || return 1 } -md5sums="a3e8562dfa1a7f4384e0e66a26acec52 libreswan-3.3.tar.gz +md5sums="7dbf9dbd79836b567e3231006eed3109 libreswan-3.5.tar.gz 014d8187d22a348a04dd2fdba4fc0d46 ipsec.initd" -sha256sums="ed30825d0d9c5742d53be1c6d251023ac23c0cccbabb4bd2714447985f05232d libreswan-3.3.tar.gz +sha256sums="0115f84c0171908b5c9b8b7d59aba42933bd50f2cb88483f752f72e16f2fd880 libreswan-3.5.tar.gz f21668846fdf6d01a7d92672adf0a5dda63f827b317ab0253a7c627968656d8f ipsec.initd" -sha512sums="407ca3088dc77d651183fe1dd4e8c259d1c39c500137c5053c7a0dae9435d5b432e22cff7e84b377344da016ebe0d9e2ed68565fe6b5837f9ecf79b0b6a6e994 libreswan-3.3.tar.gz +sha512sums="bed9c56118b141e2054c7eead027df4aabbd2ff996d329e4c59411d418e70f35f329142a5ceb0f047cd2dafea2f45d5e0933f57c84b09387990b3d364ae81462 libreswan-3.5.tar.gz c245b20e1ea8bd1a615f467e72ccbb3df7b63a60d1fcdb7b485a791377a0adfa75942ed73a6fb1c792eca472c92d3d524e33ba0594467738aac3aaa9123778b2 ipsec.initd" |