diff options
102 files changed, 2870 insertions, 701 deletions
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD index df61b15e6e..c344fd3f67 100644 --- a/main/acf-core/APKBUILD +++ b/main/acf-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-core -pkgver=0.13.3 +pkgver=0.13.4 pkgrel=0 pkgdesc="A web-based system administration interface framework" url="http://git.alpinelinux.org/cgit/acf-core" @@ -15,4 +15,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="924fa592ccefc32dfd8900f14341d2c0 acf-core-0.13.3.tar.bz2" +md5sums="4066bc210290929d653ae147baff39a8 acf-core-0.13.4.tar.bz2" diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD index fe8033caee..2c0c1e2e14 100644 --- a/main/acf-provisioning/APKBUILD +++ b/main/acf-provisioning/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-provisioning -pkgver=0.0.9 +pkgver=0.0.10 pkgrel=0 pkgdesc="ACF for provisioning templated configs to devices" url="http://git.alpinelinux.org/cgit/acf-provisioning" @@ -18,4 +18,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="f2d1fb7fc15f6b7779c2de986f218050 acf-provisioning-0.0.9.tar.bz2" +md5sums="e30ecbbd3ea641da8117cf3dceb6716d acf-provisioning-0.0.10.tar.bz2" diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index d08bd81823..232fe8c0df 100644 --- a/main/acf-weblog/APKBUILD +++ b/main/acf-weblog/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-weblog -pkgver=0.5.9 -pkgrel=2 +pkgver=0.6.0 +pkgrel=0 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles" url="http://git.alpinelinux.org/cgit/acf-weblog" arch="noarch" @@ -18,4 +18,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="bdac4a705b896e78cf68cc498361a335 acf-weblog-0.5.9.tar.bz2" +md5sums="ce074d18d847541980598788db6e9058 acf-weblog-0.6.0.tar.bz2" diff --git a/main/acf-weblog/acf-weblog.post-upgrade b/main/acf-weblog/acf-weblog.post-upgrade index a15590cc73..18ed542fcf 100644..100755 --- a/main/acf-weblog/acf-weblog.post-upgrade +++ b/main/acf-weblog/acf-weblog.post-upgrade @@ -3,40 +3,63 @@ new=$1 old=$2 -# if current is not older than 0.5.4 we exit. -if ! [ "$(apk version -t $old 0.5.4)" = "<" ]; then - exit 0 -fi +# if current is older than 0.4.0 we update. +if [ "$(apk version -t $old 0.4.0)" = "<" ]; then -psql -U postgres -c "ALTER TABLE weblog ALTER bytes TYPE bigint"\ - webproxylog -psql -U postgres -c "ALTER TABLE pubweblog ALTER bytes TYPE bigint"\ +psql -U postgres -c "ALTER TABLE weblog ADD COLUMN shortreason text" \ webproxylog -psql -U postgres -c "ALTER TABLE blocklog ALTER bytes TYPE bigint"\ +psql -U postgres -c "ALTER TABLE pubweblog ADD COLUMN shortreason text" \ webproxylog -psql -U postgres -c "ALTER TABLE pubblocklog ALTER bytes TYPE bigint"\ +psql -U postgres -c "ALTER TABLE pubblocklog ADD COLUMN shortreason text" \ + webproxylog +psql -U postgres -c "ALTER TABLE blocklog ADD COLUMN shortreason text" \ webproxylog -# if current is not older than 0.4.5 we exit. -if ! [ "$(apk version -t $old 0.4.5)" = "<" ]; then - exit 0 fi +# if current is older than 0.4.5 we update. +if [ "$(apk version -t $old 0.4.5)" = "<" ]; then + psql -U postgres -c "ALTER TABLE dbhistlog ALTER logdatetime TYPE timestamp(3)"\ webproxylog -if ! [ "$(apk version -t $old 0.4.0)" = "<" ]; then - exit 0 fi -psql -U postgres -c "ALTER TABLE weblog ADD COLUMN shortreason text" \ + +# if current is older than 0.5.4 we update. +if [ "$(apk version -t $old 0.5.4)" = "<" ]; then + +psql -U postgres -c "ALTER TABLE weblog ALTER bytes TYPE bigint"\ webproxylog -psql -U postgres -c "ALTER TABLE pubweblog ADD COLUMN shortreason text" \ +psql -U postgres -c "ALTER TABLE pubweblog ALTER bytes TYPE bigint"\ webproxylog -psql -U postgres -c "ALTER TABLE pubblocklog ADD COLUMN shortreason text" \ - webproxylog -psql -U postgres -c "ALTER TABLE blocklog ADD COLUMN shortreason text" \ +psql -U postgres -c "ALTER TABLE blocklog ALTER bytes TYPE bigint"\ + webproxylog +psql -U postgres -c "ALTER TABLE pubblocklog ALTER bytes TYPE bigint"\ webproxylog -exit 0 +fi + +# if current is older than 0.6.0 we update. +if [ "$(apk version -t $old 0.6.0)" = "<" ]; then + +mkdir /etc/weblog +mv /etc/weblog.conf /etc/weblog/ +echo "Executing db updates" +psql -U postgres -c "ALTER TABLE pubweblog ADD COLUMN badyesno int, ADD COLUMN deniedyesno int, ADD COLUMN bypassyesno int, ADD COLUMN wordloc text, ADD COLUMN goodwordloc text, ADD COLUMN selected boolean, ADD COLUMN id int UNIQUE" -d webproxylog +psql -U weblogowner -c "CREATE SEQUENCE pubweblog_id_seq" -d webproxylog +psql -U postgres -c "ALTER TABLE pubweblog ALTER COLUMN id SET DEFAULT NEXTVAL('pubweblog_id_seq')" -d webproxylog +psql -U postgres -c "UPDATE pubweblog SET id = NEXTVAL('pubweblog_id_seq')" -d webproxylog +psql -U postgres -c "INSERT INTO pubweblog SELECT *,'0','1','0','','','false' FROM pubblocklog" -d webproxylog +psql -U postgres -c "INSERT INTO pubweblog SELECT *,'0','0','0','','','false' FROM weblog" -d webproxylog +psql -U postgres -c "INSERT INTO pubweblog SELECT *,'0','1','0','','','false' FROM blocklog" -d webproxylog +psql -U postgres -c "ALTER TABLE weblog ADD COLUMN badyesno int, ADD COLUMN deniedyesno int, ADD COLUMN bypassyesno int, ADD COLUMN wordloc text, ADD COLUMN goodwordloc text" -d webproxylog +psql -U weblogowner -c "CREATE TABLE pubweblog_history(sourcename character varying(40), clientip inet NOT NULL, clientuserid character varying(64) NOT NULL, logdatetime timestamp(3) without time zone NOT NULL, uri text NOT NULL, bytes bigint NOT NULL, reason text, score integer, shortreason text, badyesno int, deniedyesno int, bypassyesno int, wordloc text, goodwordloc text, selected boolean, id int)" -d webproxylog +psql -U postgres -c "GRANT SELECT ON pubweblog_history TO webloguser" -d webproxylog +psql -U postgres -c "DROP TABLE pubblocklog" -d webproxylog +psql -U postgres -c "DROP TABLE watchlist" -d webproxylog +psql -U postgres -c "DROP TABLE blocklog" -d webproxylog +fi + +exit 0 diff --git a/main/apache2/03-add-mpm-to-build-system.patch b/main/apache2/03-add-mpm-to-build-system.patch new file mode 100644 index 0000000000..974c50eb46 --- /dev/null +++ b/main/apache2/03-add-mpm-to-build-system.patch @@ -0,0 +1,25 @@ +Add the new MPM to the build system as an alternative to the other MPMs, +and mark it as experimental. + +Index: apache2.2/server/mpm/config.m4 +=================================================================== +--- apache2.2.orig/server/mpm/config.m4 2007-01-29 21:30:26.000000000 +0100 ++++ apache2.2/server/mpm/config.m4 2007-01-29 21:30:35.000000000 +0100 +@@ -1,7 +1,7 @@ + AC_MSG_CHECKING(which MPM to use) + AC_ARG_WITH(mpm, + APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use. +- MPM={beos|event|worker|prefork|mpmt_os2|winnt}),[ ++ MPM={beos|event|worker|prefork|mpmt_os2|winnt|itk}),[ + APACHE_MPM=$withval + ],[ + if test "x$APACHE_MPM" = "x"; then +@@ -23,7 +23,7 @@ + + ap_mpm_is_experimental () + { +- if test "$apache_cv_mpm" = "event" ; then ++ if test "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "itk" ; then + return 0 + else + return 1 diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 4a883adf97..5a1918e74f 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apache2 -pkgver=2.2.17 -pkgrel=5 +pkgver=2.2.21 +pkgrel=0 pkgdesc="A high performance Unix-based HTTP server" url="http://httpd.apache.org/" arch="all" @@ -9,20 +9,23 @@ license="APACHE" depends="" pkgusers="apache" pkggroups="apache" -makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev +makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev sed autoconf automake" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-ssl $pkgname-ldap" +# see http://lists.err.no/pipermail/mpm-itk/2011-August/000432.html for +# the 03-add-mpm-to-build-system.patch source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2 - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/02-rename-prefork-to-itk.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/03-add-mpm-to-build-system.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/04-correct-output-makefile-location.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/05-add-copyright.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/06-hook-just-after-merging-perdir-config.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/07-base-functionality.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/08-max-clients-per-vhost.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/09-capabilities.patch - http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02/10-nice.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/02-rename-prefork-to-itk.patch + 03-add-mpm-to-build-system.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/04-correct-output-makefile-location.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/05-add-copyright.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/06-hook-just-after-merging-perdir-config.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/07-base-functionality.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/08-max-clients-per-vhost.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/09-capabilities.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/10-nice.patch + http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01/11-fix-htaccess-reads-for-persistent-connections.patch apache2.confd apache2.logrotate apache2.initd @@ -41,15 +44,11 @@ prepare() { server/mpm/experimental/itk/ || return 1 mv server/mpm/experimental/itk/prefork.c \ server/mpm/experimental/itk/itk.c || return 1 - patch -Np1 -i "$srcdir"/02-rename-prefork-to-itk.patch || return 1 - patch -Np1 -i "$srcdir"/03-add-mpm-to-build-system.patch || return 1 - patch -Np1 -i "$srcdir"/04-correct-output-makefile-location.patch || return 1 - patch -Np1 -i "$srcdir"/05-add-copyright.patch || return 1 - patch -Np1 -i "$srcdir"/06-hook-just-after-merging-perdir-config.patch || return 1 - patch -Np1 -i "$srcdir"/07-base-functionality.patch || return 1 - patch -Np1 -i "$srcdir"/08-max-clients-per-vhost.patch || return 1 - patch -Np1 -i "$srcdir"/09-capabilities.patch || return 1 - patch -Np1 -i "$srcdir"/10-nice.patch || return 1 + for i in $source; do + case $i in + *.patch) msg ${i##*/}; patch -p1 -i "$srcdir"/${i##*/} || return 1;; + esac + done autoconf || return 1 } @@ -235,9 +234,9 @@ ldap() { "$subpkgdir"/etc/apache2/conf.d/ldap.conf || return 1 } -md5sums="16eadc59ea6b38af33874d300973202e httpd-2.2.17.tar.bz2 +md5sums="1696ae62cd879ab1d4dd9ff021a470f2 httpd-2.2.21.tar.bz2 db42cfcc18ae1c32aaaff2347e35b79d 02-rename-prefork-to-itk.patch -131408ad4dc7b18547b4e062e7e495ab 03-add-mpm-to-build-system.patch +72817bd3eddc56fd886ca4739c536261 03-add-mpm-to-build-system.patch ee488f391054d528547c3a372faa2aa7 04-correct-output-makefile-location.patch b202944761b2f0516196488b12504236 05-add-copyright.patch 78fa15f8ca3a284b7d71f942e24e47fb 06-hook-just-after-merging-perdir-config.patch @@ -245,6 +244,7 @@ d33e39350e987721d50e6fb8e164ab6b 07-base-functionality.patch 9f7a8935f9cabc7b46d0052906634cef 08-max-clients-per-vhost.patch 1b28e3363e1b0d05b738a21e7ddd264f 09-capabilities.patch d9667fcd2ffecc63e446edd4d6666731 10-nice.patch +1e5b222edcfbf99a3edc56fcb2074fbe 11-fix-htaccess-reads-for-persistent-connections.patch e322b5211e49511cac6e40c86af1b1da apache2.confd 75fe4138b98fcffd01b8c8c077b944f3 apache2.logrotate 0261136ff734c3ae8dcf878a46ed5830 apache2.initd diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD index d720e10636..184a9c001b 100644 --- a/main/apcupsd/APKBUILD +++ b/main/apcupsd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apcupsd -pkgver=3.14.9 -pkgrel=1 +pkgver=3.14.10 +pkgrel=0 pkgdesc="A Daemon to control APC UPSes" subpackages="$pkgname-doc" url="http://www.apcupsd.org" @@ -35,6 +35,6 @@ package() { install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd } -md5sums="aa5e2c2954a81c2f07e0a356e38fe853 apcupsd-3.14.9.tar.gz +md5sums="5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz 0798cd407de6f199d4c267036ec54c5b apcupsd.initd 08d9cc703cdd4275d342882deed1d719 apcupsd-alpine.patch" diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD index 1fae115b78..a3684daec0 100644 --- a/main/asciidoc/APKBUILD +++ b/main/asciidoc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=asciidoc -pkgver=8.6.5 +pkgver=8.6.6 pkgrel=0 pkgdesc="Text based documentation" url="http://www.methods.co.nz/asciidoc/" @@ -38,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="9247724283501ec1cfb27d5eae9e5eaf asciidoc-8.6.5.tar.gz +md5sums="44b872d9c300ffa5a8fe8b3c4d10957c asciidoc-8.6.6.tar.gz 7e98fd7aa3fb61af56814e214bd1ab8a vim.patch" diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD index 337dbe60a6..9625523f6d 100644 --- a/main/bc/APKBUILD +++ b/main/bc/APKBUILD @@ -1,28 +1,42 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bc -pkgver=1.06 -pkgrel=3 +pkgver=1.06.95 +pkgrel=0 pkgdesc="arbitrary precision numeric processing language (calculator)" url="http://www.gnu.org/software/bc/bc.html" arch="all" license="GPL" depends= -makedepends="flex readline-dev" +makedepends="flex readline-dev texinfo" install= subpackages="$pkgname-doc" -source="http://mirrors.kernel.org/gnu/bc/$pkgname-$pkgver.tar.gz" +source="ftp://alpha.gnu.org/gnu/bc/bc-$pkgver.tar.bz2 + bc-1.06.95-void_uninitialized.patch" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + local i + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 - make DESTDIR="$pkgdir" install +} +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install } -md5sums="d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz" +md5sums="5126a721b73f97d715bb72c13c889035 bc-1.06.95.tar.bz2 +c83b1973eb393d3b3254d7815a7e152b bc-1.06.95-void_uninitialized.patch" diff --git a/main/bc/bc-1.06.95-void_uninitialized.patch b/main/bc/bc-1.06.95-void_uninitialized.patch new file mode 100644 index 0000000000..c591f782a8 --- /dev/null +++ b/main/bc/bc-1.06.95-void_uninitialized.patch @@ -0,0 +1,13 @@ +http://www.pixelbeat.org/programming/oss_bug_flow.html +https://bugs.gentoo.org/349339 + +--- ./bc/storage.c ++++ ./bc/storage.c +@@ -99,6 +99,7 @@ + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index ac1b8ef26d..117cc9a304 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox -pkgver=1.19.0 +pkgver=1.19.2 pkgrel=0 _bbsuidver=0.6 pkgdesc="Size optimized toolbox of many common UNIX utilities" @@ -15,11 +15,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 http://git.alpinelinux.org/cgit/bbsuid.git/snapshot/bbsuid-$_bbsuidver.tar.bz2 $pkgname-1.11.1-bb.patch busybox-uname-is-not-gnu.patch - http://busybox.net/downloads/fixes-1.19.0/busybox-1.19.0-cttyhack.patch - http://busybox.net/downloads/fixes-1.19.0/busybox-1.19.0-less.patch - http://busybox.net/downloads/fixes-1.19.0/busybox-1.19.0-sed.patch - http://busybox.net/downloads/fixes-1.19.0/busybox-1.19.0-swap.patch - http://busybox.net/downloads/fixes-1.19.0/busybox-1.19.0-uncompress.patch + http://busybox.net/downloads/fixes-1.19.2/busybox-1.19.2-crond.patch busyboxconfig" # loginutils-sha512.patch @@ -87,13 +83,9 @@ static() { "$subpkgdir"/bin/busybox.static } -md5sums="9ad0b619bb788913b263eb53bbd659be busybox-1.19.0.tar.bz2 +md5sums="50267054345f1a0b77fe65f6e0e5ba29 busybox-1.19.2.tar.bz2 968b3a058db04f95e9c4cdb44d7d3ddb bbsuid-0.6.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch -4d64393857732f513c40172757fff7c2 busybox-1.19.0-cttyhack.patch -67c0c719ddb768ee6bbdcf4c3bed45ca busybox-1.19.0-less.patch -89f9693f0b76b6012b74d73bb772dcc7 busybox-1.19.0-sed.patch -21b13f7cfe133acd24f370b7c855668a busybox-1.19.0-swap.patch -92fb297b15f81108a1c2647f7bd67db4 busybox-1.19.0-uncompress.patch +2707b318e733d5b091e2df301e418b5a busybox-1.19.2-crond.patch 4ec89e4b45bcf667974a2778a559196f busyboxconfig" diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index 170a308ec4..1328d5059c 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=coreutils -pkgver=8.12 -pkgrel=1 +pkgver=8.13 +pkgrel=0 pkgdesc="The basic file, shell and text manipulation utilities" url="http://www.gnu.org/software/coreutils/" arch="all" @@ -41,4 +41,4 @@ package() { mv chroot "$pkgdir"/usr/sbin/ } -md5sums="fce7999953a67243d00d75cc86dbcaa6 coreutils-8.12.tar.gz" +md5sums="f5e8bb4752ee2e876ddd99bda7471f35 coreutils-8.13.tar.gz" diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index 7e2ff506fb..7b9c235c6d 100644 --- a/main/cups/APKBUILD +++ b/main/cups/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cups -pkgver=1.4.8 +pkgver=1.5.0 pkgrel=0 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" @@ -15,19 +15,30 @@ pkgusers="lp" source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2 $pkgname.logrotate cupsd.initd + cups-CVE-2011-2896.patch " depends_dev="openssl-dev zlib-dev" -build () -{ +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { cd "$srcdir"/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-logdir=/var/log/cups \ - --with-docdir=/usr/share/cups/doc \ + --with-docdir=/usr/share/doc/cups \ --with-cups-user=lp \ --with-cups-group=lp \ --with-system-groups=lpadmin \ @@ -78,7 +89,6 @@ client() { depends= _mv usr/bin \ usr/share/cups/charsets \ - usr/share/cups/charmaps \ usr/sbin/accept \ usr/sbin/cupsaddsmb \ usr/sbin/cupsctl \ @@ -89,9 +99,9 @@ client() { usr/sbin/lpinfo \ usr/sbin/lpmove \ usr/sbin/reject - touch "$subpkgdir"/usr/share/cups/charmaps/us-ascii.txt } -md5sums="0ec52d3f3c69bc2ab5ed70c594edbce6 cups-1.4.8-source.tar.bz2 +md5sums="e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2 f861b18f4446c43918c8643dcbbd7f6d cups.logrotate -1154ed66fdcfa0523f929a369079f43c cupsd.initd" +1154ed66fdcfa0523f929a369079f43c cupsd.initd +2e952332e93970b12bae955c7222604d cups-CVE-2011-2896.patch" diff --git a/main/cups/cups-CVE-2011-2896.patch b/main/cups/cups-CVE-2011-2896.patch new file mode 100644 index 0000000000..a949b9df9a --- /dev/null +++ b/main/cups/cups-CVE-2011-2896.patch @@ -0,0 +1,33 @@ +diff -up cups-1.4.8/filter/image-gif.c.CVE-2011-2896 cups-1.4.8/filter/image-gif.c +--- cups-1.4.8/filter/image-gif.c.CVE-2011-2896 2011-06-20 21:37:51.000000000 +0100 ++++ cups-1.4.8/filter/image-gif.c 2011-08-19 11:33:37.547911212 +0100 +@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp, /* I - File to + + if (code == max_code) + { +- *sp++ = firstcode; +- code = oldcode; ++ if (sp < (stack + 8192)) ++ *sp++ = firstcode; ++ ++ code = oldcode; + } + +- while (code >= clear_code) ++ while (code >= clear_code && sp < (stack + 8192)) + { + *sp++ = table[1][code]; + if (code == table[0][code]) +@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp, /* I - File to + code = table[0][code]; + } + +- *sp++ = firstcode = table[1][code]; +- code = max_code; ++ if (sp < (stack + 8192)) ++ *sp++ = firstcode = table[1][code]; ++ ++ code = max_code; + + if (code < 4096) + { diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD index dfbc3baba1..2a91a0d095 100644 --- a/main/curl/APKBUILD +++ b/main/curl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=curl -pkgver=7.21.7 -pkgrel=2 +pkgver=7.22.0 +pkgrel=0 pkgdesc="An URL retrival utility and library" url="http://curl.haxx.se" arch="all" @@ -39,4 +39,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="5f6d50c4d4ee38c57fe37e3cff75adbd curl-7.21.7.tar.bz2" +md5sums="bdb5c226d37c4a6082c70e7ef6f63060 curl-7.22.0.tar.bz2" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 626d0f8bb2..d158205e61 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -16,8 +16,8 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=$pkgver # when chaning _dahdiver we *must* bump _mypkgrel -_dahdiver=2.5.0 -_mypkgrel=0 +_dahdiver=2.5.0.1 +_mypkgrel=1 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -77,7 +77,7 @@ dev() { ln -s /usr/include "$dir"/include } -md5sums="449f6591ccedb68937b5b30cbd37cea3 dahdi-linux-2.5.0.tar.gz +md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch 9088ee5cd24f94b7f90c24e5ed6071e0 dahdi-2.5.0-bri-fixes.patch diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index 7b5cb6d000..b785366d70 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -15,8 +15,8 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=$pkgver # when bumping _dahdiver we *must* bump _mypkgrel -_dahdiver=2.5.0 -_mypkgrel=1 +_dahdiver=2.5.0.1 +_mypkgrel=2 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver" url="http://www.asterisk.org" @@ -76,7 +76,7 @@ dev() { ln -s /usr/include "$dir"/include } -md5sums="449f6591ccedb68937b5b30cbd37cea3 dahdi-linux-2.5.0.tar.gz +md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz c78fb8d80f9efdffd950297c88ff9273 dahdi-depmod.patch 3bb419ac598534cd4ad5248f23656001 dahdi-bri_dchan.patch 9088ee5cd24f94b7f90c24e5ed6071e0 dahdi-2.5.0-bri-fixes.patch diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD index e0beed4407..86296c1938 100644 --- a/main/dahdi-linux/APKBUILD +++ b/main/dahdi-linux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-linux -pkgver=2.5.0 +pkgver=2.5.0.1 pkgrel=0 pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers" url="http://www.asterisk.org" @@ -39,4 +39,4 @@ package() { install-include install-firmware } -md5sums="449f6591ccedb68937b5b30cbd37cea3 dahdi-linux-2.5.0.tar.gz" +md5sums="d7efc5ebc9bf81a5263321e5e9891fc1 dahdi-linux-2.5.0.1.tar.gz" diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD index 87fc95f8cb..2ca8b29e14 100644 --- a/main/dahdi-tools/APKBUILD +++ b/main/dahdi-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=dahdi-tools -pkgver=2.5.0 +pkgver=2.5.0.1 pkgrel=0 pkgdesc="Digium Asterisk Hardware Device Interface management utilities" url="http://www.asterisk.org" @@ -35,5 +35,5 @@ package() { install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi } -md5sums="a44f71c6eadd02830f48b3e73998767d dahdi-tools-2.5.0.tar.gz +md5sums="826a433aaaa96ad089bd93f6afb68615 dahdi-tools-2.5.0.1.tar.gz d9702271dba6ff250f4d9a252f4dbf4c dahdi-tools.initd" diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD index 0aaf80f9e1..d0f68fc0b9 100644 --- a/main/diffutils/APKBUILD +++ b/main/diffutils/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=diffutils -pkgver=3.1 +pkgver=3.2 pkgrel=0 pkgdesc="Show differences among files" subpackages="$pkgname-doc" @@ -28,4 +28,4 @@ package() { make install DESTDIR=$pkgdir } -md5sums="29c15b2de8bf33685029e035fa680a6e diffutils-3.1.tar.gz" +md5sums="22e4deef5d8949a727b159d6bc65c1cc diffutils-3.2.tar.gz" diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD index 83e4338d8d..7a42614e6f 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot pkgver=2.0.14 -pkgrel=0 +pkgrel=1 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" arch="all" @@ -62,11 +62,15 @@ package() { "$pkgdir"/etc/dovecot/dovecot.conf || return 1 mkdir -p "$pkgdir"/etc/dovecot/conf.d - # fix ssl dirs in defautl config and set defautl passdb to passwd + # fix ssl dirs in default config and set defautl passdb to passwd sed -i -e 's,^ssl_cert =.*,ssl_cert = </etc/ssl/dovecot/server.pem,' \ -e 's,^ssl_key =.*,ssl_key = </etc/ssl/dovecot/server.key,' \ "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/10-ssl.conf\ || return 1 + + # install ssl config by default + cp "$pkgdir"/usr/share/doc/dovecot/example-config/conf.d/10-ssl.conf\ + "$pkgdir"/etc/dovecot/conf.d/ || return 1 } _mv() { diff --git a/main/dovecot/dovecot.post-install b/main/dovecot/dovecot.post-install index e4d6bb281b..c014fcbb47 100644 --- a/main/dovecot/dovecot.post-install +++ b/main/dovecot/dovecot.post-install @@ -3,7 +3,7 @@ # based on doc/mkcert.sh # if ssl disabled then lets just exit -doveconf ssl | grep -q 'yes' || exit 0 +doveconf ssl 2>/dev/null | grep -q 'yes' || exit 0 # Generates a self-signed certificate. OPENSSL=${OPENSSL-openssl} @@ -25,7 +25,7 @@ fi # check if we have ssl_cert and/or key (for dovecot-2.0+) # try expand the cert/key itself and if found, lets just keep it [ -n "$(doveconf -x ssl_cert 2>/dev/null)" ] && exit 0 -[ -n "$(doveconf -x ssl_cert 2>/dev/null)" ] && exit 0 +[ -n "$(doveconf -x ssl_key 2>/dev/null)" ] && exit 0 [ -z "$ssl_cert_file" ] && ssl_cert_file=$(doveconf ssl_cert | sed 's/.*= <//') [ -z "$ssl_key_file" ] && ssl_key_file=$(doveconf ssl_key | sed 's/.*= <//') diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD index 9902be2f61..feba98fbc8 100644 --- a/main/feh/APKBUILD +++ b/main/feh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=feh -pkgver=1.15.1 +pkgver=1.16.1 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://www.linuxbrit.co.uk/feh/" @@ -24,4 +24,4 @@ package() { make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="0684ff2dad34ee328ab2b6b717281787 feh-1.15.1.tar.bz2" +md5sums="1bb080c7b0021db50884a52161251990 feh-1.16.1.tar.bz2" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 622670cbd5..2be83ea212 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -59,5 +59,5 @@ package() { install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } -md5sums="967d481c98161582d149aced6e3b2f31 ffmpeg-0.8.2.tar.bz2 +md5sums="556870ccfd6c9c0426c7dd86dd5beb62 ffmpeg-0.8.3.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index b6b8e77936..e488e4784c 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdb -pkgver=7.3 +pkgver=7.3.1 pkgrel=0 pkgdesc="The GNU Debugger" url="http://sources.redhat.com/gdb/" @@ -45,4 +45,4 @@ package() { rm -rf "$pkgdir"/usr/lib } -md5sums="485022b8df7ba2221f217e128f479fe7 gdb-7.3.tar.bz2" +md5sums="b89a5fac359c618dda97b88645ceab47 gdb-7.3.1.tar.bz2" diff --git a/main/gnuchess/APKBUILD b/main/gnuchess/APKBUILD index b0cca224a4..b700049cca 100644 --- a/main/gnuchess/APKBUILD +++ b/main/gnuchess/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnuchess -pkgver=6.0.0 +pkgver=6.0.1 pkgrel=0 pkgdesc="The GNU chess program" url="http://www.gnu.org/software/chess/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="1a7a46188dab76f4339d22ff47c31515 gnuchess-6.0.0.tar.gz" +md5sums="041888218f73886f146fa7fbf92190de gnuchess-6.0.1.tar.gz" diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 0c78dabca1..d0bf3145fc 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.7.1.0 +pkgver=6.7.2.2 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -57,4 +57,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/ } -md5sums="65cb96f5d4826921a378924604e0f491 ImageMagick-6.7.1-0.tar.gz" +md5sums="22b4aaecf2bd9430c43aa1c8703dad43 ImageMagick-6.7.2-2.tar.gz" diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD index 150a198027..a5eed4152c 100644 --- a/main/imlib2/APKBUILD +++ b/main/imlib2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imlib2 -pkgver=1.4.4 -pkgrel=7 +pkgver=1.4.5 +pkgrel=0 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch="all" @@ -10,13 +10,11 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="tiff-dev giflib-dev bzip2-dev freetype-dev libxext-dev libpng-dev libid3tag-dev jpeg-dev libsm-dev zlib-dev util-linux-dev" -source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 - imlib2-png15.patch" +source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p0 < "$srcdir"/imlib2-png15.patch } build() { @@ -37,5 +35,4 @@ package() { "$pkgdir"/usr/lib/imlib2/*/*.la || return 1 install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } -md5sums="b6de51879502e857d5b1f7622267a030 imlib2-1.4.4.tar.bz2 -8222a87235e8e0a17c01b81ea12c5184 imlib2-png15.patch" +md5sums="859e5fede51ec819f4314eee11da3ea5 imlib2-1.4.5.tar.bz2" diff --git a/main/imlib2/imlib2-png15.patch b/main/imlib2/imlib2-png15.patch deleted file mode 100644 index d66b918000..0000000000 --- a/main/imlib2/imlib2-png15.patch +++ /dev/null @@ -1,78 +0,0 @@ -# http://sourceforge.net/mailarchive/message.php?msg_id=26972342 - -$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $ - -Fix build with png-1.5. - ---- src/modules/loaders/loader_png.c.orig 2010-02-08 00:29:06.000000000 -0800 -+++ src/modules/loaders/loader_png.c 2010-02-08 00:34:14.000000000 -0800 -@@ -58,7 +58,7 @@ - fclose(f); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(f); -@@ -238,7 +238,7 @@ - png_structp png_ptr; - png_infop info_ptr; - DATA32 *ptr; -- int x, y, j; -+ int x, y, j, interlace; - png_bytep row_ptr, data = NULL; - png_color_8 sig_bit; - int pl = 0; -@@ -265,7 +265,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(f); - png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr); -@@ -274,11 +274,11 @@ - } - - /* check whether we should use interlacing */ -+ interlace = PNG_INTERLACE_NONE; - if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val) - { - #ifdef PNG_WRITE_INTERLACING_SUPPORTED -- png_ptr->interlaced = PNG_INTERLACE_ADAM7; -- num_passes = png_set_interlace_handling(png_ptr); -+ interlace = PNG_INTERLACE_ADAM7; - #endif - } - -@@ -286,7 +286,7 @@ - if (im->flags & F_HAS_ALPHA) - { - png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, -- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced, -+ PNG_COLOR_TYPE_RGB_ALPHA, interlace, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - #ifdef WORDS_BIGENDIAN - png_set_swap_alpha(png_ptr); -@@ -297,7 +297,7 @@ - else - { - png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB, -- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE, -+ interlace, PNG_COMPRESSION_TYPE_BASE, - PNG_FILTER_TYPE_BASE); - data = malloc(im->w * 3 * sizeof(char)); - } -@@ -344,6 +344,10 @@ - png_set_shift(png_ptr, &sig_bit); - png_set_packing(png_ptr); - -+#ifdef PNG_WRITE_INTERLACING_SUPPORTED -+ num_passes = png_set_interlace_handling(png_ptr); -+#endif -+ - for (pass = 0; pass < num_passes; pass++) - { - ptr = im->data; diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index a4b41e1c73..273a4c079b 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables -pkgver=1.4.12 +pkgver=1.4.12.1 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" @@ -75,7 +75,7 @@ ip6tables() { "$subpkgdir"/etc/init.d/ip6tables } -md5sums="d3f145c2c91daecbb4251bc79390b46c iptables-1.4.12.tar.bz2 +md5sums="b08a1195ec2c1ebeaf072db3c55fdf43 iptables-1.4.12.1.tar.bz2 ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd 2ae5c23689c65ed7e827802c47acd426 iptables.confd diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD index 9a4b6a809b..303405e2e9 100644 --- a/main/libarchive/APKBUILD +++ b/main/libarchive/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libarchive -pkgver=2.8.4 -pkgrel=2 +pkgver=2.8.5 +pkgrel=0 pkgdesc="library that can create and read several streaming archive formats" url="http://libarchive.googlecode.com/" arch="all" @@ -31,4 +31,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="83b237a542f27969a8d68ac217dc3796 libarchive-2.8.4.tar.gz" +md5sums="9caf51dcf6213e9c9f5a1c27448b9c90 libarchive-2.8.5.tar.gz" diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD index 8535c3c7f2..1ebdefe078 100644 --- a/main/libconfig/APKBUILD +++ b/main/libconfig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libconfig -pkgver=1.4.7 -pkgrel=1 +pkgver=1.4.8 +pkgrel=0 pkgdesc="a simple library for manipulating structured configuration files" url="http://www.hyperrealm.com/libconfig/" arch="all" @@ -26,4 +26,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="d57da7a91aadbfd53afedb5c1bade5f4 libconfig-1.4.7.tar.gz" +md5sums="36788da452e9fcfc8efb7661ef5d31ef libconfig-1.4.8.tar.gz" diff --git a/main/libgee/APKBUILD b/main/libgee/APKBUILD index 04298aa1c1..9a65d08a6e 100644 --- a/main/libgee/APKBUILD +++ b/main/libgee/APKBUILD @@ -1,7 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgee -pkgver=0.6.1 -pkgrel=1 +pkgver=0.6.2.1 +_rest=${pkgver#*.*.} +_xy=${pkgver%.$_rest} +pkgrel=0 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" arch="all" @@ -9,7 +11,7 @@ license="LGPL2.1" depends="" makedepends=" glib-dev" subpackages="$pkgname-dev" -source="http://ftp.gnome.org/pub/GNOME/sources/libgee/${pkgver%.*}/libgee-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/GNOME/sources/libgee/${_xy}/libgee-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver build() { @@ -24,4 +26,4 @@ package() { rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="9cf60f41f3aa10ac7f1f7e1d094e05a1 libgee-0.6.1.tar.bz2" +md5sums="9c95ab9462179610d39df3c5a0911f3b libgee-0.6.2.1.tar.bz2" diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD index ce82eb9daf..06c607446a 100644 --- a/main/libmicrohttpd/APKBUILD +++ b/main/libmicrohttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmicrohttpd -pkgver=0.9.12 +pkgver=0.9.14 pkgrel=0 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." url="http://www.gnu.org/software/libmicrohttpd/" @@ -43,4 +43,4 @@ package() { "$pkgdir"/usr/include/plibc.h } -md5sums="35b000cd7d201ace2b071d53a02b2c0d libmicrohttpd-0.9.12.tar.gz" +md5sums="9bc69bb2898e4b27dd3dd7e4b8ac7098 libmicrohttpd-0.9.14.tar.gz" diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD index 025f979b5c..c642a0a5b7 100644 --- a/main/librsvg/APKBUILD +++ b/main/librsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=librsvg -pkgver=2.34.0 -pkgrel=1 +pkgver=2.34.1 +pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="http://librsvg.sourceforge.net/" arch="all" @@ -29,7 +29,8 @@ build() { package() { cd "$_builddir" make DESTDIR=""$pkgdir"" install || return 1 - rm -rf "$pkgdir"/usr/lib/mozilla "$pkgdir"/usr/lib/*.la + rm -rf "$pkgdir"/usr/lib/mozilla || return 1 + find "$pkgdir" -name '*.la' -delete } -md5sums="5eb2fcd0765aa5e47a4999985e3c27ab librsvg-2.34.0.tar.bz2" +md5sums="e2eeca43fb725d028561834888071106 librsvg-2.34.1.tar.bz2" diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD index 17c50b96fd..ecf28f7eaa 100644 --- a/main/libsamplerate/APKBUILD +++ b/main/libsamplerate/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsamplerate -pkgver=0.1.7 -pkgrel=5 +pkgver=0.1.8 +pkgrel=0 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio" url="http://www.mega-nerd.com/SRC/index.html" subpackages="$pkgname-dev" @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="6731a81cb0c622c483b28c0d7f90867d libsamplerate-0.1.7.tar.gz" +md5sums="1c7fb25191b4e6e3628d198a66a84f47 libsamplerate-0.1.8.tar.gz" diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index d8783c3416..19a22714d2 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libsndfile pkgver=1.0.25 -pkgrel=0 +pkgrel=2 pkgdesc="A C library for reading and writing files containing sampled sound" url="http://www.mega-nerd.com/libsndfile" arch="all" @@ -14,8 +14,10 @@ source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz" build () { cd "$srcdir"/$pkgname-$pkgver + ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ ./configure --prefix=/usr \ --disable-sqlite \ + --enable-largefile \ || return 1 make || return 1 } diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD index 4a8332850c..5c26b6956d 100644 --- a/main/libssh2/APKBUILD +++ b/main/libssh2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libssh2 -pkgver=1.2.9 +pkgver=1.3.0 pkgrel=0 pkgdesc="library for accessing ssh1/ssh2 protocol servers" url="http://libssh2.org/" @@ -42,4 +42,4 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="62ea143c41c6ed437a55d6a0b0579f2f libssh2-1.2.9.tar.gz" +md5sums="6425331899ccf1015f1ed79448cb4709 libssh2-1.3.0.tar.gz" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 556b5e0361..feaee5114f 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.0.4 _kernver=3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -140,5 +140,5 @@ md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 62ca5f3caed233617127b2b3b7a87d15 patch-3.0.4.bz2 a9343c3253aec2ca3accb8539eb44148 grsecurity-2.2.2-3.0.4-201109011725.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch -406e62e430cee7ba3bb37be341d9ff3e kernelconfig.x86 +9a2c88b20d296158cdcd01f843898415 kernelconfig.x86 6957efc9f017c59b05aa0a2e4167255e kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 27588733db..e5287a1978 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.3 Kernel Configuration +# Linux/i386 3.0.4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -401,7 +401,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_HIGHPTE is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 -# CONFIG_MATH_EMULATION is not set +CONFIG_MATH_EMULATION=y CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 @@ -5042,7 +5042,6 @@ CONFIG_GRKERNSEC_PROC_IPADDR=y # # Executable Protections # -CONFIG_GRKERNSEC_EXECVE=y # CONFIG_GRKERNSEC_DMESG is not set CONFIG_GRKERNSEC_HARDEN_PTRACE=y # CONFIG_GRKERNSEC_TPE is not set diff --git a/main/make/APKBUILD b/main/make/APKBUILD index 57cdf613d7..96ba9e78db 100644 --- a/main/make/APKBUILD +++ b/main/make/APKBUILD @@ -1,16 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=make pkgver=3.82 -pkgrel=1 +pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make" arch="all" license=GPL depends= subpackages="$pkgname-doc" -source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + make-3.82-savannah-bugs-30612-30723.patch" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -25,4 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="7f7c000e3b30c6840f2e9cf86b254fac make-3.82.tar.gz" +md5sums="7f7c000e3b30c6840f2e9cf86b254fac make-3.82.tar.gz +74e598a2052f7d98e3495ea9d917ecf4 make-3.82-savannah-bugs-30612-30723.patch" diff --git a/main/make/make-3.82-savannah-bugs-30612-30723.patch b/main/make/make-3.82-savannah-bugs-30612-30723.patch new file mode 100644 index 0000000000..1b09825479 --- /dev/null +++ b/main/make/make-3.82-savannah-bugs-30612-30723.patch @@ -0,0 +1,75 @@ +diff -Naur make-3.82-orig/main.c make-3.82/main.c +--- make-3.82-orig/main.c 2010-07-19 14:10:53.000000000 +0700 ++++ make-3.82/main.c 2011-01-12 21:31:30.114891591 +0700 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +@@ -2093,7 +2094,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) +diff -Naur make-3.82-orig/read.c make-3.82/read.c +--- make-3.82-orig/read.c 2010-07-13 08:20:42.000000000 +0700 ++++ make-3.82/read.c 2011-01-12 21:31:23.497486028 +0700 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD index b2b8181d9f..1d6ce3c310 100644 --- a/main/mc/APKBUILD +++ b/main/mc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mc -pkgver=4.7.5.3 +pkgver=4.7.5.4 pkgrel=0 pkgdesc="A filemanager/shell that emulates Norton Commander" url="http://www.ibiblio.org/mc/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="6a67e139e0032d8a871455a80d490941 mc-4.7.5.3.tar.bz2" +md5sums="1e53e27fb3bed21c9042689d5777b5aa mc-4.7.5.4.tar.bz2" diff --git a/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch b/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch deleted file mode 100644 index 7a82978f17..0000000000 --- a/main/mkinitfs/0001-init-fix-progressbar-when-not-quiet.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b9ad256b04db3965bf21ed7ee25ddfd7c166d102 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 27 Apr 2011 09:15:20 +0000 -Subject: [PATCH] init: fix progressbar when not quiet - -see http://bugs.alpinelinux.org/issues/613 ---- - initramfs-init.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index 7b09722..a0e594d 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -462,6 +462,9 @@ fi - - # install new root - ebegin "Installing packages to root filesystem" -+# insert newline unless quiet to fix progress bar -+[ -n "$KOPT_quiet" ] || echo "" -+ - if [ "$KOPT_chart" = yes ]; then - pkgs="$pkgs acct" - fi --- -1.7.4.5 - diff --git a/main/mkinitfs/0001-mkinitfs-add-squashfs-support.patch b/main/mkinitfs/0001-mkinitfs-add-squashfs-support.patch deleted file mode 100644 index 6296b74bd3..0000000000 --- a/main/mkinitfs/0001-mkinitfs-add-squashfs-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ca5dcc3002c21637c99b7b022fc47d6d776486e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Sat, 27 Aug 2011 12:33:22 +0000 -Subject: [PATCH 1/2] mkinitfs: add squashfs support - ---- - Makefile | 1 + - modules.d/squashfs | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - create mode 100644 modules.d/squashfs - -diff --git a/Makefile b/Makefile -index a25444f..c986e10 100644 ---- a/Makefile -+++ b/Makefile -@@ -26,6 +26,7 @@ CONF_FILES := mkinitfs.conf \ - modules.d/raid \ - modules.d/reiserfs \ - modules.d/scsi \ -+ modules.d/squashfs \ - modules.d/ubifs \ - modules.d/usb \ - modules.d/virtio \ -diff --git a/modules.d/squashfs b/modules.d/squashfs -new file mode 100644 -index 0000000..bf93fbc ---- /dev/null -+++ b/modules.d/squashfs -@@ -0,0 +1 @@ -+kernel/fs/squashfs --- -1.7.6.1 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index bf93bc2733..2067ae1428 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,16 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.3.4 -pkgrel=5 +pkgver=2.4.0 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-init-fix-progressbar-when-not-quiet.patch - mount-move.patch - delay-umount-apkovl.patch - 0001-mkinitfs-add-squashfs-support.patch eglibc.patch " arch="noarch" @@ -31,7 +27,7 @@ prepare() { esac ;; *.patch) - patch -p1 -i "$srcdir"/$i || return 1 + msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;; esac done @@ -46,9 +42,5 @@ package() { cd "$srcdir"/$pkgname-$pkgver make install DESTDIR="$pkgdir" || return 1 } -md5sums="abec6dced89e137dc60542c1e5f938ac mkinitfs-2.3.4.tar.bz2 -4ea4389d5dff0a69d6792420574d2f1f 0001-init-fix-progressbar-when-not-quiet.patch -049392dd315240d2c7d892ef67072e03 mount-move.patch -6d8b0a6f3b7a90152d84eda373743d84 delay-umount-apkovl.patch -2632949239ddcd680cfc0c7ffab75024 0001-mkinitfs-add-squashfs-support.patch +md5sums="3b7ca4f70bdded5fca0c0c70ddac56f6 mkinitfs-2.4.0.tar.bz2 e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" diff --git a/main/mkinitfs/delay-umount-apkovl.patch b/main/mkinitfs/delay-umount-apkovl.patch deleted file mode 100644 index 983008b3fb..0000000000 --- a/main/mkinitfs/delay-umount-apkovl.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/initramfs-init.in b/initramfs-init.in -index f64ef26..8f01c8f 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -244,8 +244,8 @@ resolve_dev() { - esac - } - --# remount ALPINE_MNT according given fstab --remount_alpine_mnt() { -+# relocate ALPINE_MNT according given fstab -+relocate_alpine_mnt() { - local fstab="$1" - local mnt=$(find_mnt $ALPINE_DEV $fstab) - if [ "$ALPINE_MNT" != "$mnt" ]; then -@@ -253,10 +253,6 @@ remount_alpine_mnt() { - mount -o move $ALPINE_MNT $mnt - ALPINE_MNT=$mnt - fi -- # respect users mount options in fstab -- if [ -n "$MNTOPTS" ]; then -- mount -o remount,$MNTOPTS "$ALPINE_MNT" -- fi - } - - # gotta start from somewhere :) -@@ -458,7 +454,6 @@ if [ -f "$ovl" ]; then - eend $? $errstr || ovlfiles= - # hack, incase /root/.ssh was included in apkovl - [ -d "$sysroot/root" ] && chmod 700 "$sysroot/root" -- umount $ovl_unmount 2>/dev/null & - pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)" - rm -f "$sysroot"/etc/lbu/packages.list - pkgs="$pkgs $(cat $sysroot/var/lib/apk/world $sysroot/etc/apk/world 2>/dev/null)" -@@ -480,12 +475,19 @@ else - rc_add savecache shutdown - fi - --# let user override tmpfs size in fstab in apkovl - if [ -f $sysroot/etc/fstab ]; then -+ has_fstab=1 -+ -+ # let user override tmpfs size in fstab in apkovl - mountopts=$(awk '$2 == "/" && $3 == "tmpfs" { print $4 }' $sysroot/etc/fstab) - if [ -n "$mountopts" ]; then - mount -o remount,$mountopts $sysroot - fi -+ -+ # move the ALPINE_MNT if ALPINE_DEV is specified in users fstab -+ # this is so a generated /etc/apk/repositories will use correct -+ # mount dir -+ relocate_alpine_mnt "$sysroot"/etc/fstab - fi - - # in case we upgrade we might need those: -@@ -496,13 +498,6 @@ rc_add modloop sysinit - # hack so we get openrc - pkgs="$pkgs alpine-base" - --# move the ALPINE_MNT if ALPINE_DEV is specified in users fstab --# this is so a generated /etc/apk/repositories will use correct mount dir --if [ -f "$sysroot"/etc/fstab ]; then -- has_fstab=1 -- remount_alpine_mnt "$sysroot"/etc/fstab --fi -- - # copy keys so apk finds them. apk looks for stuff relative --root - mkdir -p $sysroot/etc/apk/keys/ - cp -a /etc/apk/keys $sysroot/etc/apk -@@ -537,11 +532,23 @@ else - fi - eend $? - -+# unmount ovl mount if needed -+if [ -n "$ovl_unmount" ]; then -+ umount $ovl_unmount 2>/dev/null -+fi -+ - # remount ALPINE_MNT according default fstab from package - if [ -z "$has_fstab" ] && [ -f "$sysroot"/etc/fstab ]; then -- remount_alpine_mnt "$sysroot"/etc/fstab -+ relocate_alpine_mnt "$sysroot"/etc/fstab - fi - -+# respect mount options in fstab for ALPINE_MNT (e.g if user wants rw) -+opts=$(awk "\$2 == \"$ALPINE_MNT\" {print \$4}" $sysroot/etc/fstab) -+if [ -n "$opts" ]; then -+ mount -o remount,$opts "$ALPINE_MNT" -+fi -+ -+ - # fix inittab if alternative console - setup_inittab_console $CONSOLE - diff --git a/main/mkinitfs/mount-move.patch b/main/mkinitfs/mount-move.patch deleted file mode 100644 index 4931663246..0000000000 --- a/main/mkinitfs/mount-move.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/initramfs-init.in b/initramfs-init.in -index 2ff2585..f64ef26 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -104,10 +104,32 @@ unpack_apkovl() { - } - - # find mount dir for given device in an fstab -+# returns global MNTOPTS - find_mnt() { -- local dev="$1" -- local fsfile="$2" -- awk "\$1 == \"$dev\" {print \$2}\"" "$fsfile" 2>/dev/null -+ local search_dev="$1" fstab="$2" -+ MNTOPTS= -+ [ -r "$fstab" ] || return 1 -+ local dev mnt fs chk -+ case "$search_dev" in -+ UUID=*|LABEL=*|/dev/*);; -+ *) search_dev=/dev/$search_dev;; -+ esac -+ local search_real_dev=$(resolve_dev $search_dev) -+ while read dev mnt fs MNTOPTS chk; do -+ local real_dev=$(resolve_dev $dev) -+ local i j -+ for i in "$search_dev" "$search_real_dev"; do -+ [ -z "$i" ] && continue -+ for j in "$dev" "$real_dev"; do -+ [ -z "$j" ] && continue -+ if [ "$i" = "$j" ]; then -+ echo "$mnt" -+ return -+ fi -+ done -+ done -+ done < $fstab -+ MNTOPTS= - } - - # Wait for usb to settle -@@ -214,6 +236,29 @@ start_lvm() { - lvm vgchange --ignorelockingfailure -a y >/dev/null 2>&1 - } - -+# resolve an uuid or symlink to the real device -+resolve_dev() { -+ case "$1" in -+ UUID=*|LABEL=*) findfs "$1";; -+ *) readlink -f "$1";; -+ esac -+} -+ -+# remount ALPINE_MNT according given fstab -+remount_alpine_mnt() { -+ local fstab="$1" -+ local mnt=$(find_mnt $ALPINE_DEV $fstab) -+ if [ "$ALPINE_MNT" != "$mnt" ]; then -+ mkdir -p "$mnt" -+ mount -o move $ALPINE_MNT $mnt -+ ALPINE_MNT=$mnt -+ fi -+ # respect users mount options in fstab -+ if [ -n "$MNTOPTS" ]; then -+ mount -o remount,$MNTOPTS "$ALPINE_MNT" -+ fi -+} -+ - # gotta start from somewhere :) - echo "Alpine Init $VERSION" - -@@ -270,7 +315,7 @@ if [ -n "$KOPT_ovl_dev" ] ; then - fi - - case "$ALPINE_DEV" in -- UUID=*) ;; -+ UUID=*|LABEL=*) ;; - *) ALPINE_DEV=/dev/$ALPINE_DEV ;; - esac - -@@ -453,20 +498,9 @@ pkgs="$pkgs alpine-base" - - # move the ALPINE_MNT if ALPINE_DEV is specified in users fstab - # this is so a generated /etc/apk/repositories will use correct mount dir --new_mnt=$(find_mnt $ALPINE_DEV $sysroot/etc/fstab) --if [ -n "$new_mnt" ] && [ "$new_mnt" != "$ALPINE_MNT" ]; then -- mkdir -p $new_mnt -- mount -o move $ALPINE_MNT $new_mnt -- ALPINE_MNT="$new_mnt" --fi -- --# let user set ALPINE_MNT as readonly in fstab --if [ -f $sysroot/etc/fstab ]; then -- mountopts=$(awk "\$2 == \"$ALPINE_MNT\" { print \$4 }" \ -- $sysroot/etc/fstab) -- if [ -n "$mountopts" ]; then -- mount -o remount,$mountopts $ALPINE_MNT -- fi -+if [ -f "$sysroot"/etc/fstab ]; then -+ has_fstab=1 -+ remount_alpine_mnt "$sysroot"/etc/fstab - fi - - # copy keys so apk finds them. apk looks for stuff relative --root -@@ -503,6 +537,11 @@ else - fi - eend $? - -+# remount ALPINE_MNT according default fstab from package -+if [ -z "$has_fstab" ] && [ -f "$sysroot"/etc/fstab ]; then -+ remount_alpine_mnt "$sysroot"/etc/fstab -+fi -+ - # fix inittab if alternative console - setup_inittab_console $CONSOLE - diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD index 7965c486d2..fda38f93a9 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sebastian Wicki <gandro@gmx.net> # Maintainer: Natanael Copa <natanael.copa@gmail.com> pkgname=mpd -pkgver=0.16.3 -pkgrel=1 +pkgver=0.16.4 +pkgrel=0 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" url="http://musicpd.org" pkgusers="mpd" @@ -50,6 +50,6 @@ package() { "$pkgdir"/var/lib/mpd/playlists \ "$pkgdir"/var/lib/mpd/music } -md5sums="6e708c02b0e8c288aec855eecf441a5a mpd-0.16.3.tar.bz2 +md5sums="ddac46eb7d976c5cc6f9bac9e4e100f1 mpd-0.16.4.tar.bz2 2ccbb38edc6dff5b5740760837f3005a mpd.initd dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd" diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index 7aaca4e1de..8da495f4c8 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 -pkgver=1.13.3 +pkgver=1.13.4 pkgrel=0 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" url="http://sourceforge.net/projects/mpg123" @@ -10,6 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="pkgconfig libtool alsa-lib-dev" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" +options="libtool" build() { cd "$srcdir"/$pkgname-$pkgver @@ -28,10 +29,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -# mpg123 needs the output_*.la files so we move them back from -dev package -dev() { - default_dev - mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/ -} - -md5sums="b1f990ce76dcf2fdf9d53ac39fc6bc7e mpg123-1.13.3.tar.bz2" +md5sums="073620b3938c4cb9c4f70e8fe3e114b8 mpg123-1.13.4.tar.bz2" diff --git a/testing/ngrep/APKBUILD b/main/ngrep/APKBUILD index 67d6253d1e..67d6253d1e 100644 --- a/testing/ngrep/APKBUILD +++ b/main/ngrep/APKBUILD diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 335116f910..8f719ec345 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec _realname=open-vm-tools -_mypkgrel=3 +_mypkgrel=0 # source open-vm-tools version if [ -f ../../main/$_realname/APKBUILD ]; then @@ -65,5 +65,5 @@ package() { done } -md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz +md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index 480a019297..692b03ce32 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -65,5 +65,5 @@ package() { done } -md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz +md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd" diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index 9ce7481a59..dd4c4d5789 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=open-vm-tools -pkgver=2011.07.19 -_pkgsubver=450511 +pkgver=2011.08.21 +_pkgsubver=471295 pkgrel=0 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="http://open-vm-tools.sourceforge.net/" @@ -82,7 +82,7 @@ gtk() { "$subpkgdir"/usr/lib/open-vm-tools/plugins/ } -md5sums="efe9b078045e9f7ea1e1311bf11857e6 open-vm-tools-2011.07.19-450511.tar.gz +md5sums="fd32f03ab6068c265597a74b916ca81e open-vm-tools-2011.08.21-471295.tar.gz 49e2e394d0b567fa71fcd295e96bc1c8 getloadavg-uclibc.patch 82840b6bed002284b9bd2358707ee826 codeset-uclibc.patch 840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index f8a0bedf9d..dbec01100b 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl -pkgver=1.0.0d +pkgver=1.0.0e pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" @@ -69,7 +69,7 @@ libssl() { done } -md5sums="40b6ea380cc8a5bf9734c2f8bf7e701e openssl-1.0.0d.tar.gz +md5sums="7040b89c4c58c7a1016c0dfa6e821c86 openssl-1.0.0e.tar.gz 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch 1f607b8e11347e56a0906756f3d6928a 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch diff --git a/main/perl-list-moreutils/APKBUILD b/main/perl-list-moreutils/APKBUILD index cade2866a8..29d1dd4459 100644 --- a/main/perl-list-moreutils/APKBUILD +++ b/main/perl-list-moreutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-list-moreutils -pkgver=0.32 +pkgver=0.33 pkgrel=0 pkgdesc="List::MoreUtils perl module" url="http://search.cpan.org/dist/List-MoreUtils/" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="5af56334f8261f4662bd5e2b3f5e4e62 List-MoreUtils-0.32.tar.gz" +md5sums="8a33c84028cc2ff3e92c92434b326c0f List-MoreUtils-0.33.tar.gz" diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD index f73f51bdea..aff2a4cb9d 100644 --- a/main/postfix/APKBUILD +++ b/main/postfix/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postfix -pkgver=2.8.4 -pkgrel=1 +pkgver=2.8.5 +pkgrel=0 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)" url="http://www.postfix.org/" arch="all" @@ -152,7 +152,7 @@ pcre() { _mv_dict pcre ; } pgsql() { _mv_dict pgsql ; } sqlite() { _mv_dict sqlite ; } -md5sums="a9fdd0f204e7ca0b7d32fd0b9f8f8c72 postfix-2.8.4.tar.gz +md5sums="a38128959af680009cae8cbcc03e0f10 postfix-2.8.5.tar.gz 6bbabcd041aefaf40e1f3ee1fc1d6d7e postfix.initd 632fce950f64aa0794f9c2af85d45423 0001-support-for-dynamic-maps.patch 442efd1a95b0c061dfb8ab75456e0f24 dynamicmaps.cf diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index 7d04211f21..5bb39415e1 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql -pkgver=9.0.4 -pkgrel=0 +pkgver=9.1.0 +pkgrel=1 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" arch="all" license="BSD" -depends="bbsuid postgresql-client" +depends="postgresql-client" install="$pkgname.pre-upgrade" depends_dev="readline-dev openssl-dev zlib-dev libxml2-dev" makedepends="$depends_dev" @@ -22,7 +22,6 @@ build() { cd "$srcdir"/$pkgname-$pkgver || return 1 ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --with-docdir=/usr/share/doc \ --with-openssl \ || return 1 @@ -58,7 +57,7 @@ client() { } -md5sums="80390514d568a7af5ab61db1cda27e29 postgresql-9.0.4.tar.bz2 +md5sums="0497b9da1d7c380c340a9a87ba5500fe postgresql-9.1.0.tar.bz2 66c197b8186a6df0752fe2aed40c90c4 postgresql.initd c56a4db0c3757f5dc7f9d59132b428ba postgresql.confd 5f6d10a6a3d71dcee856fa6671954ab4 pg-restore.initd diff --git a/main/postgresql/postgresql.pre-upgrade b/main/postgresql/postgresql.pre-upgrade index 989e021673..bcdedaac88 100644 --- a/main/postgresql/postgresql.pre-upgrade +++ b/main/postgresql/postgresql.pre-upgrade @@ -1,11 +1,12 @@ #!/bin/sh - new="$1" old="$2" -compare=$(apk version -t "$old" 8.4) -# check if we upgrade from earlier than 8.4 and if it is running +pgver=${new%*.} +compare=$(apk version -t "$old" $pgver) + +# check if we upgrade from earlier than $pgver and if it is running if [ "$compare" != "<" ] || ! /etc/init.d/postgresql --quiet status; then exit 0 fi @@ -15,8 +16,8 @@ if [ -f /etc/conf.d/postgresql ]; then fi cat <<EOF -* You are upgrading to postgres 8.4 wich is not compatible with the running -* See: http://www.postgresql.org/docs/8.4/interactive/install-upgrading.html +* You are upgrading to postgres $pgver wich is not compatible with the running +* See: http://www.postgresql.org/docs/$pgver/static/upgrading.html * * The corresponding steps for Alpine Linux is: * diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD index c3907106ca..162d6da0f9 100644 --- a/main/ppp/APKBUILD +++ b/main/ppp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=6 +pkgrel=7 pkgdesc="A daemon which implements the PPP protocol for dial-up networking" url="http://www.samba.org/ppp/" arch="all" @@ -10,6 +10,7 @@ depends= makedepends="libpcap-dev" subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz + defaultroute-metric.3.patch options pon poff @@ -19,6 +20,16 @@ source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz ip-down" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build () { cd "$_builddir" @@ -58,6 +69,7 @@ package() { mkdir -p "$pkgdir"/etc/ppp/peers } md5sums="4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz +e26f807a61490fedbc9a7632caebd973 defaultroute-metric.3.patch 9185f645bb433b22a9951d9d12f79c35 options 48c024f73a80c8b69c4def22f86902cc pon 2d811f8470ccdea3b8c4505a438483e9 poff diff --git a/main/ppp/defaultroute-metric.3.patch b/main/ppp/defaultroute-metric.3.patch new file mode 100644 index 0000000000..2eee724c23 --- /dev/null +++ b/main/ppp/defaultroute-metric.3.patch @@ -0,0 +1,129 @@ +Default route metric + +Define the metric of the default route and only add it if there +is no other default route with the same metric. With the default +value of -1, the route is only added if there is no default route +at all. + +Olivier Mehani <olivier.mehani@nicta.com.au> +Index: ppp-2.4.4/pppd/options.c +=================================================================== +--- ppp-2.4.4.orig/pppd/options.c 2006-06-18 21:26:00.000000000 +1000 ++++ ppp-2.4.4/pppd/options.c 2010-04-22 17:08:38.000000000 +1000 +@@ -119,6 +119,7 @@ + bool dryrun; /* print out option values and exit */ + char *domain; /* domain name set by domain option */ + int child_wait = 5; /* # seconds to wait for children at exit */ ++int dfl_route_metric = -1; /* metric of the default route to set over the PPP link */ + + #ifdef MAXOCTETS + unsigned int maxoctets = 0; /* default - no limit */ +@@ -281,6 +282,10 @@ + "Number of seconds to wait for child processes at exit", + OPT_PRIO }, + ++ { "defaultroute-metric", o_int, &dfl_route_metric, ++ "Metric to use for the default route (Linux only; -1 for default behavior)", ++ OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 }, ++ + #ifdef HAVE_MULTILINK + { "multilink", o_bool, &multilink, + "Enable multilink operation", OPT_PRIO | 1 }, +Index: ppp-2.4.4/pppd/sys-linux.c +=================================================================== +--- ppp-2.4.4.orig/pppd/sys-linux.c 2005-08-27 08:44:35.000000000 +1000 ++++ ppp-2.4.4/pppd/sys-linux.c 2010-04-22 17:09:44.000000000 +1000 +@@ -232,7 +232,7 @@ + static void close_route_table (void); + static int open_route_table (void); + static int read_route_table (struct rtentry *rt); +-static int defaultroute_exists (struct rtentry *rt); ++static int defaultroute_exists (struct rtentry *rt, int metric); + static int get_ether_addr (u_int32_t ipaddr, struct sockaddr *hwaddr, + char *name, int namelen); + static void decode_version (char *buf, int *version, int *mod, int *patch); +@@ -242,6 +242,8 @@ + + extern u_char inpacket_buf[]; /* borrowed from main.c */ + ++extern int dfl_route_metric; ++ + /* + * SET_SA_FAMILY - set the sa_family field of a struct sockaddr, + * if it exists. +@@ -1526,9 +1528,10 @@ + /******************************************************************** + * + * defaultroute_exists - determine if there is a default route ++ * with the given metric (or negative for any) + */ + +-static int defaultroute_exists (struct rtentry *rt) ++static int defaultroute_exists (struct rtentry *rt, int metric) + { + int result = 0; + +@@ -1541,7 +1544,8 @@ + + if (kernel_version > KVERSION(2,1,0) && SIN_ADDR(rt->rt_genmask) != 0) + continue; +- if (SIN_ADDR(rt->rt_dst) == 0L) { ++ if (SIN_ADDR(rt->rt_dst) == 0L && (metric < 0 || ++ (metric >= 0 && (rt->rt_metric + 1) == metric))) { + result = 1; + break; + } +@@ -1588,13 +1592,13 @@ + { + struct rtentry rt; + +- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) { ++ if (defaultroute_exists(&rt, dfl_route_metric) && strcmp(rt.rt_dev, ifname) != 0) { + if (rt.rt_flags & RTF_GATEWAY) +- error("not replacing existing default route via %I", +- SIN_ADDR(rt.rt_gateway)); ++ error("not replacing existing default route via %I with metric %d", ++ SIN_ADDR(rt.rt_gateway), dfl_route_metric); + else +- error("not replacing existing default route through %s", +- rt.rt_dev); ++ error("not replacing existing default route through %s with metric %d", ++ rt.rt_dev, dfl_route_metric); + return 0; + } + +@@ -1602,6 +1606,7 @@ + SET_SA_FAMILY (rt.rt_dst, AF_INET); + + rt.rt_dev = ifname; ++ rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */ + + if (kernel_version > KVERSION(2,1,0)) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); +@@ -1634,6 +1639,9 @@ + SET_SA_FAMILY (rt.rt_dst, AF_INET); + SET_SA_FAMILY (rt.rt_gateway, AF_INET); + ++ rt.rt_dev = ifname; ++ rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */ ++ + if (kernel_version > KVERSION(2,1,0)) { + SET_SA_FAMILY (rt.rt_genmask, AF_INET); + SIN_ADDR(rt.rt_genmask) = 0L; +Index: ppp-2.4.4/pppd/pppd.8 +=================================================================== +--- ppp-2.4.4.orig/pppd/pppd.8 2006-06-16 10:01:23.000000000 +1000 ++++ ppp-2.4.4/pppd/pppd.8 2010-04-22 17:08:38.000000000 +1000 +@@ -121,6 +121,12 @@ + This entry is removed when the PPP connection is broken. This option + is privileged if the \fInodefaultroute\fR option has been specified. + .TP ++.B defaultroute-metric ++Define the metric of the \fIdefaultroute\fR and only add it if there ++is no other default route with the same metric. With the default ++value of -1, the route is only added if there is no default route at ++all. ++.TP + .B disconnect \fIscript + Execute the command specified by \fIscript\fR, by passing it to a + shell, after diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index ed778191b6..5ec16ff0e3 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=0 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" @@ -229,7 +229,7 @@ x11() { usr/lib/qt/plugins } -md5sums="49b96eefb1224cc529af6fe5608654fe qt-everywhere-opensource-src-4.7.3.tar.gz +md5sums="ddf7d83f912cf1283aa066368464fa22 qt-everywhere-opensource-src-4.7.4.tar.gz a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop d457f0a0ad68a3861c3cadefe3b42ded designer.desktop 668331d9798a0e2b94381efb7be4c513 linguist.desktop diff --git a/main/shotwell/APKBUILD b/main/shotwell/APKBUILD index 9f751890c1..dd34f78f71 100644 --- a/main/shotwell/APKBUILD +++ b/main/shotwell/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=shotwell -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=0 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" url="http://yorba.org/shotwell/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="f0e942b639d899a91c3cf343f6f553bb shotwell-0.11.0.tar.bz2" +md5sums="e2c388bfce992b5437281c4fc29357d9 shotwell-0.11.1.tar.bz2" diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD index 1f6d1598e2..a9ef673098 100644 --- a/main/squark/APKBUILD +++ b/main/squark/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=squark -pkgver=0.2 -pkgrel=1 +pkgver=0.3 +pkgrel=0 pkgdesc="Squark - Squid User Authentication and Rating Kit" subpackages= depends="haserl lua" @@ -35,4 +35,4 @@ package() { make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install } -md5sums="777ef0d595b12872e3ed6647ef50e98a squark-0.2.tar.bz2" +md5sums="c10f606354523bb47665c77aef2b7929 squark-0.3.tar.bz2" diff --git a/main/sshpass/APKBUILD b/main/sshpass/APKBUILD new file mode 100644 index 0000000000..c47f23ffc3 --- /dev/null +++ b/main/sshpass/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=sshpass +pkgver=1.05 +pkgrel=0 +pkgdesc="Non-interactive SSH authentication utility" +url="http://sshpass.sourceforge.net/" +arch="all" +license="GPLv2" +depends="" +makedepends="" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/sshpass/sshpass-$pkgver.tar.gz" + +_builddir="$srcdir"/sshpass-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="c52d65fdee0712af6f77eb2b60974ac7 sshpass-1.05.tar.gz" diff --git a/main/sylpheed/APKBUILD b/main/sylpheed/APKBUILD index 081579854d..7a87966f4d 100644 --- a/main/sylpheed/APKBUILD +++ b/main/sylpheed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sylpheed -pkgver=3.1.0 -pkgrel=1 +pkgver=3.1.2 +pkgrel=0 pkgdesc="Lightweight and user-friendly e-mail client" url="http://sylpheed.sraoss.jp/en/" arch="all" @@ -24,4 +24,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } -md5sums="311847d73d0dda63a48e5ec107538424 sylpheed-3.1.0.tar.bz2" +md5sums="17100ab8ef5ef7e431bdbcff68bbf7b4 sylpheed-3.1.2.tar.bz2" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 459085bc35..6cf19fd4a7 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux pkgver=4.04 -pkgrel=6 +pkgrel=8 pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" arch="x86 x86_64" @@ -37,5 +37,5 @@ package() { } md5sums="a3936208767eb7ced65320abe2e33a10 syslinux-4.04.tar.bz2 -14443fe391bd315a54478851abdc32cb update-extlinux.conf -7164c110dae13a8d06d175943e48b841 update-extlinux" +92ed1795cfda4bc2f06fca2da0dc977c update-extlinux.conf +16ef4c8f2f8746f97f943c249b6bd4e5 update-extlinux" diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux index a2488cc8df..8a26ffe6ca 100755 --- a/main/syslinux/update-extlinux +++ b/main/syslinux/update-extlinux @@ -89,6 +89,28 @@ echo "MENU AUTOBOOT Alpine will be booted automatically in # seconds." >> $conf. echo "TIMEOUT $rtimeout" >> $conf.new lst=0 +if [ -f "/boot/xen.gz" ]; then + for kernel in $(find /boot -name vmlinuz-* -type f); do + tag=$(basename $kernel | cut -b9-) + everbose "Found Xen hypervisor: /boot/xen.gz, kernel: $kernel" + + if [ -f "/boot/initramfs-$tag" ]; then + everbose "Found initramfs: /boot/initramfs-$tag" + initramfs="initramfs-$tag" + fi + + echo "LABEL $lst" >> $conf.new + if [ "$lst" = "$default" ]; then + echo " MENU DEFAULT" >> $conf.new + fi + echo " MENU LABEL Xen + Linux $tag" >> $conf.new + echo " KERNEL mboot.c32" >> $conf.new + echo " APPEND xen.gz $xen_opts --- $(basename $kernel) root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts --- $initramfs" >> $conf.new + echo "" >> $conf.new + lst=$(($lst + 1)) + done +fi + for kernel in $(find /boot -name vmlinuz-* -type f); do tag=$(basename $kernel | cut -b9-) everbose "Found kernel: $kernel" @@ -122,7 +144,7 @@ everbose "$lst entries found." for entry in /etc/update-extlinux.d/*; do [ -f "$entry" ] && cat $entry >> $conf.new -done +done if [ "$overwrite" = "1" ]; then # keep a backup just in case diff --git a/main/syslinux/update-extlinux.conf b/main/syslinux/update-extlinux.conf index 17a47f22ca..c64988b793 100644 --- a/main/syslinux/update-extlinux.conf +++ b/main/syslinux/update-extlinux.conf @@ -29,3 +29,8 @@ verbose=0 # hidden # if set to non-zero, the boot menu will be hidden by default. hidden=1 + +# xen_opts +# options to hand to xen hypervisor, useful ones are: +# dom0_mem=256M (give domain-0 environment 256M ram) +xen_opts=dom0_mem=256M diff --git a/main/tig/APKBUILD b/main/tig/APKBUILD index 7b82d72fc6..893767f34b 100644 --- a/main/tig/APKBUILD +++ b/main/tig/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tig -pkgver=0.17 -pkgrel=1 +pkgver=0.18 +pkgrel=0 pkgdesc="Text-mode interface for git" url="http://jonas.nitro.dk/tig/" arch="all" @@ -41,4 +41,4 @@ package() { } -md5sums="f373343199422c59518776db448dec0e tig-0.17.tar.gz" +md5sums="4fa9e33c5daa76b6fed11e068405356f tig-0.18.tar.gz" diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD index 34ac11adac..a9f2c3d882 100644 --- a/main/webkit/APKBUILD +++ b/main/webkit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=webkit -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" @@ -59,4 +59,4 @@ gtklauncher() { "$subpkgdir"/usr/bin/GtkLauncher } -md5sums="361f8420e93d12101d650758fec09fa0 webkit-1.4.2.tar.gz" +md5sums="86a4354e65853687bf942100763225bb webkit-1.4.3.tar.gz" diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 6b31e8e746..e74ae5f376 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.27 -pkgrel=0 +pkgver=1.3.28 +pkgrel=1 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" arch="x86" @@ -11,12 +11,10 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison libpng-dev jpeg-dev freetype-dev ncurses-dev openssl-dev libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev - fontconfig-dev cups-dev alsa-lib-dev lcms-dev libxml2-dev + cups-dev alsa-lib-dev lcms-dev libxml2-dev gstreamer-dev gst-plugins-base-dev paxctl autoconf automake" source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2 - dn_skipname.patch - uclibc-fmaxf-fminf.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -36,9 +34,8 @@ prepare() { build() { cd "$_builddir" ./configure --prefix=/usr \ - --sysconfdir=/etc/wine \ --with-x - make depend && make + make } package() { @@ -49,6 +46,4 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="d717ecec6959d8cab194c61c29c3dcdf wine-1.3.27.tar.bz2 -6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch -1127b41caf4de8f567b9a3d0aff5277f uclibc-fmaxf-fminf.patch" +md5sums="70574d609161cec8523804cd9364bcd2 wine-1.3.28.tar.bz2" diff --git a/main/wine/dn_skipname.patch b/main/wine/dn_skipname.patch deleted file mode 100644 index 99ecf83158..0000000000 --- a/main/wine/dn_skipname.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./dlls/dnsapi/ns_parse.c.orig -+++ ./dlls/dnsapi/ns_parse.c -@@ -69,6 +69,35 @@ - } while (0) - - /* Public. */ -+#ifdef __UCLIBC__ -+int -+dn_skipname(const u_char *comp_dn, const u_char *eom) -+{ -+ const u_char *cp; -+ int n; -+ -+ cp = comp_dn; -+ while (cp < eom && (n = *cp++)) { -+ /* -+ * check for indirection -+ */ -+ switch (n & INDIR_MASK) { -+ case 0: /* normal case, n == len */ -+ cp += n; -+ continue; -+ case INDIR_MASK: /* indirection */ -+ cp++; -+ break; -+ default: /* illegal type */ -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) -+ return (-1); -+ return (cp - comp_dn); -+} -+#endif - - static int - dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { diff --git a/main/wine/uclibc-fmaxf-fminf.patch b/main/wine/uclibc-fmaxf-fminf.patch deleted file mode 100644 index 1f26cb8b96..0000000000 --- a/main/wine/uclibc-fmaxf-fminf.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./dlls/d3dx9_36/mesh.c.orig -+++ ./dlls/d3dx9_36/mesh.c -@@ -40,6 +40,18 @@ - #include "wine/list.h" - #include "d3dx9_36_private.h" - -+#ifdef __UCLIBC__ -+float fmaxf(float a, float b) -+{ -+ return (a > b) ? a : b; -+} -+ -+float fminf(float a, float b) -+{ -+ return (a < b) ? a : b; -+} -+#endif -+ - WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - - typedef struct ID3DXMeshImpl diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index f7894496bf..55bb615f1a 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wireshark -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=0 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" @@ -76,6 +76,6 @@ tshark() { mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark } -md5sums="dc1e8c9800b64130674b120a183e2308 wireshark-1.6.1.tar.bz2 +md5sums="301677b5f8150265315632fb6247e06e wireshark-1.6.2.tar.bz2 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop e771800a8c977fe223583a453bc27397 wireshark.png" diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index ef53c5ccbc..cf179749db 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -1,13 +1,13 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xen -pkgver=4.1.0 +pkgver=4.1.1 pkgrel=1 pkgdesc="Xen hypervisor" url="http://www.xen.org/" license="GPL" depends="coreutils python sed gawk" -makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-ng-dev python-dev gettext-dev ncurses-dev perl" +makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-dev python-dev gettext-dev ncurses-dev perl" install= subpackages="$pkgname-doc" source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz @@ -19,6 +19,8 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g blktap-write.patch xen-x86-pic.patch xen-gcc-4.6-Werror-fix.patch + xen-gcc-4.6-hvmloader-is-broken.patch + xencommons.initd xend.initd xendomains.initd" arch="x86 x86_64" @@ -80,11 +82,12 @@ package() { make -j1 DESTDIR="$pkgdir" install-xen install-tools install-stubdom \ || return 1 + install -m755 -D "$srcdir"/xencommons.initd "$pkgdir"/etc/init.d/xencommons install -m755 -D "$srcdir"/xend.initd "$pkgdir"/etc/init.d/xend install -m755 -D "$srcdir"/xendomains.initd "$pkgdir"/etc/init.d/xendomains } -md5sums="db3e1542b7719f375593b2b32b01a177 xen-4.1.0.tar.gz +md5sums="fab4bf74d73444ff9b43bced2e4fc5a2 xen-4.1.1.tar.gz edb5c3e7fba8214702fac709f0e53124 xen-blktap-uclibc.patch 1f7f847ae0baa915c7b52d0ed5869fe6 xen-blktap2-uclibc.patch a569f16a7e3c832ba3fab6154f657244 xen-disable-firmware.patch @@ -93,5 +96,7 @@ a569f16a7e3c832ba3fab6154f657244 xen-disable-firmware.patch 56af00443c8d40944082e26304452a5e blktap-write.patch c4fc42b11c5917a93f66acf0f83a8747 xen-x86-pic.patch faafc199fa8cf33aac44e41c9e1659ea xen-gcc-4.6-Werror-fix.patch -1d81b04f8c8b919879a73f0e3d2fe80f xend.initd +202dae12f61f4068971cf9b0f47081da xen-gcc-4.6-hvmloader-is-broken.patch +0b62c1fbe2699a32e745724fd301db5b xencommons.initd +5ee6a16ec70dfbcd4944ded71b393fa2 xend.initd a2b5234483f1b5892d22e9315d9c307f xendomains.initd" diff --git a/main/xen/xen-gcc-4.6-hvmloader-is-broken.patch b/main/xen/xen-gcc-4.6-hvmloader-is-broken.patch new file mode 100644 index 0000000000..767abed5d3 --- /dev/null +++ b/main/xen/xen-gcc-4.6-hvmloader-is-broken.patch @@ -0,0 +1,733 @@ + +# HG changeset patch +# User Keir Fraser <keir@xen.org> +# Date 1311171934 -3600 +# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533 +# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c +hvmloader: Switch to absolute addressing for calling hypercall stubs. + +This is clearer and less fragile than trying to make relative calls +work. In particular, the old approach failed if _start was not +== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern +toolchains which reorder functions. + +Signed-off-by: Keir Fraser <keir@xen.org> +xen-unstable changeset: 23730:dd5eecf739d1 +xen-unstable date: Wed Jul 20 15:02:16 2011 +0100 + + +hvmloader: Remove hard tabs from source files. + +Signed-off-by: Keir Fraser <keir@xen.org> +xen-unstable changeset: 23729:4f1109af9c63 +xen-unstable date: Wed Jul 20 14:52:16 2011 +0100 + +diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h +--- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100 ++++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100 +@@ -35,147 +35,148 @@ + #include <xen/xen.h> + #include "config.h" + +-/* +- * NB. Hypercall address needs to be relative to a linkage symbol for +- * some version of ld to relocate the relative calls properly. +- */ +-#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \ +- " + " STR(HYPERCALL_PHYSICAL_ADDRESS) ++#define hcall_addr(name) \ ++ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32) + +-#define _hypercall0(type, name) \ +-({ \ +- long __res; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res) \ +- : \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall0(type, name) \ ++({ \ ++ long __res; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res) \ ++ : "0" (hcall_addr(name)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + +-#define _hypercall1(type, name, a1) \ +-({ \ +- long __res, __ign1; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res), "=b" (__ign1) \ +- : "1" ((long)(a1)) \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall1(type, name, a1) \ ++({ \ ++ long __res, __ign1; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res), "=b" (__ign1) \ ++ : "0" (hcall_addr(name)), \ ++ "1" ((long)(a1)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + +-#define _hypercall2(type, name, a1, a2) \ +-({ \ +- long __res, __ign1, __ign2; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ +- : "1" ((long)(a1)), "2" ((long)(a2)) \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall2(type, name, a1, a2) \ ++({ \ ++ long __res, __ign1, __ign2; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ ++ : "0" (hcall_addr(name)), \ ++ "1" ((long)(a1)), "2" ((long)(a2)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + +-#define _hypercall3(type, name, a1, a2, a3) \ +-({ \ +- long __res, __ign1, __ign2, __ign3; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ +- "=d" (__ign3) \ +- : "1" ((long)(a1)), "2" ((long)(a2)), \ +- "3" ((long)(a3)) \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall3(type, name, a1, a2, a3) \ ++({ \ ++ long __res, __ign1, __ign2, __ign3; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ ++ "=d" (__ign3) \ ++ : "0" (hcall_addr(name)), \ ++ "1" ((long)(a1)), "2" ((long)(a2)), \ ++ "3" ((long)(a3)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + +-#define _hypercall4(type, name, a1, a2, a3, a4) \ +-({ \ +- long __res, __ign1, __ign2, __ign3, __ign4; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ +- "=d" (__ign3), "=S" (__ign4) \ +- : "1" ((long)(a1)), "2" ((long)(a2)), \ +- "3" ((long)(a3)), "4" ((long)(a4)) \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall4(type, name, a1, a2, a3, a4) \ ++({ \ ++ long __res, __ign1, __ign2, __ign3, __ign4; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ ++ "=d" (__ign3), "=S" (__ign4) \ ++ : "0" (hcall_addr(name)), \ ++ "1" ((long)(a1)), "2" ((long)(a2)), \ ++ "3" ((long)(a3)), "4" ((long)(a4)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + +-#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ +-({ \ +- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ +- asm volatile ( \ +- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ +- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ +- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ +- : "1" ((long)(a1)), "2" ((long)(a2)), \ +- "3" ((long)(a3)), "4" ((long)(a4)), \ +- "5" ((long)(a5)) \ +- : "memory" ); \ +- (type)__res; \ ++#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ ++({ \ ++ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ ++ asm volatile ( \ ++ "call *%%eax" \ ++ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ ++ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ ++ : "0" (hcall_addr(name)), \ ++ "1" ((long)(a1)), "2" ((long)(a2)), \ ++ "3" ((long)(a3)), "4" ((long)(a4)), \ ++ "5" ((long)(a5)) \ ++ : "memory" ); \ ++ (type)__res; \ + }) + + static inline int + hypercall_sched_op( +- int cmd, void *arg) ++ int cmd, void *arg) + { +- return _hypercall2(int, sched_op, cmd, arg); ++ return _hypercall2(int, sched_op, cmd, arg); + } + + static inline int + hypercall_memory_op( +- unsigned int cmd, void *arg) ++ unsigned int cmd, void *arg) + { +- return _hypercall2(int, memory_op, cmd, arg); ++ return _hypercall2(int, memory_op, cmd, arg); + } + + static inline int + hypercall_multicall( +- void *call_list, int nr_calls) ++ void *call_list, int nr_calls) + { +- return _hypercall2(int, multicall, call_list, nr_calls); ++ return _hypercall2(int, multicall, call_list, nr_calls); + } + + static inline int + hypercall_event_channel_op( +- int cmd, void *arg) ++ int cmd, void *arg) + { +- return _hypercall2(int, event_channel_op, cmd, arg); ++ return _hypercall2(int, event_channel_op, cmd, arg); + } + + static inline int + hypercall_xen_version( +- int cmd, void *arg) ++ int cmd, void *arg) + { +- return _hypercall2(int, xen_version, cmd, arg); ++ return _hypercall2(int, xen_version, cmd, arg); + } + + static inline int + hypercall_console_io( +- int cmd, int count, char *str) ++ int cmd, int count, char *str) + { +- return _hypercall3(int, console_io, cmd, count, str); ++ return _hypercall3(int, console_io, cmd, count, str); + } + + static inline int + hypercall_vm_assist( +- unsigned int cmd, unsigned int type) ++ unsigned int cmd, unsigned int type) + { +- return _hypercall2(int, vm_assist, cmd, type); ++ return _hypercall2(int, vm_assist, cmd, type); + } + + static inline int + hypercall_vcpu_op( +- int cmd, int vcpuid, void *extra_args) ++ int cmd, int vcpuid, void *extra_args) + { +- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); ++ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); + } + + static inline int + hypercall_hvm_op( +- int cmd, void *arg) ++ int cmd, void *arg) + { +- return _hypercall2(int, hvm_op, cmd, arg); ++ return _hypercall2(int, hvm_op, cmd, arg); + } + + #endif /* __HVMLOADER_HYPERCALL_H__ */ +diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h +--- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100 ++++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100 +@@ -1,69 +1,69 @@ + /* +- * pci_regs.h ++ * pci_regs.h + * +- * PCI standard defines +- * Copyright 1994, Drew Eckhardt +- * Copyright 1997--1999 Martin Mares <mj@ucw.cz> ++ * PCI standard defines ++ * Copyright 1994, Drew Eckhardt ++ * Copyright 1997--1999 Martin Mares <mj@ucw.cz> + * +- * For more information, please consult the following manuals (look at +- * http://www.pcisig.com/ for how to get them): ++ * For more information, please consult the following manuals (look at ++ * http://www.pcisig.com/ for how to get them): + * +- * PCI BIOS Specification +- * PCI Local Bus Specification +- * PCI to PCI Bridge Specification +- * PCI System Design Guide ++ * PCI BIOS Specification ++ * PCI Local Bus Specification ++ * PCI to PCI Bridge Specification ++ * PCI System Design Guide + */ + + #ifndef __HVMLOADER_PCI_REGS_H__ + #define __HVMLOADER_PCI_REGS_H__ + +-#define PCI_VENDOR_ID 0x00 /* 16 bits */ +-#define PCI_DEVICE_ID 0x02 /* 16 bits */ +-#define PCI_COMMAND 0x04 /* 16 bits */ +-#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ +-#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ +-#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ +-#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ +-#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ +-#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ +-#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ +-#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ +-#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ +-#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ ++#define PCI_VENDOR_ID 0x00 /* 16 bits */ ++#define PCI_DEVICE_ID 0x02 /* 16 bits */ ++#define PCI_COMMAND 0x04 /* 16 bits */ ++#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ ++#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ ++#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ ++#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ ++#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ ++#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ ++#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ ++#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ ++#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ ++#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ + #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ + +-#define PCI_STATUS 0x06 /* 16 bits */ +-#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ +-#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ +-#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ +-#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ +-#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ +-#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ +-#define PCI_STATUS_DEVSEL_FAST 0x000 +-#define PCI_STATUS_DEVSEL_MEDIUM 0x200 +-#define PCI_STATUS_DEVSEL_SLOW 0x400 +-#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ +-#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ +-#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ +-#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ +-#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ ++#define PCI_STATUS 0x06 /* 16 bits */ ++#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ ++#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ ++#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ ++#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ ++#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ ++#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ ++#define PCI_STATUS_DEVSEL_FAST 0x000 ++#define PCI_STATUS_DEVSEL_MEDIUM 0x200 ++#define PCI_STATUS_DEVSEL_SLOW 0x400 ++#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ ++#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ ++#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ ++#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ ++#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ + +-#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ +-#define PCI_REVISION_ID 0x08 /* Revision ID */ +-#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ +-#define PCI_CLASS_DEVICE 0x0a /* Device class */ ++#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ ++#define PCI_REVISION_ID 0x08 /* Revision ID */ ++#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ ++#define PCI_CLASS_DEVICE 0x0a /* Device class */ + +-#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ +-#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ +-#define PCI_HEADER_TYPE 0x0e /* 8 bits */ +-#define PCI_HEADER_TYPE_NORMAL 0 +-#define PCI_HEADER_TYPE_BRIDGE 1 +-#define PCI_HEADER_TYPE_CARDBUS 2 ++#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ ++#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ ++#define PCI_HEADER_TYPE 0x0e /* 8 bits */ ++#define PCI_HEADER_TYPE_NORMAL 0 ++#define PCI_HEADER_TYPE_BRIDGE 1 ++#define PCI_HEADER_TYPE_CARDBUS 2 + +-#define PCI_BIST 0x0f /* 8 bits */ +-#define PCI_BIST_CODE_MASK 0x0f /* Return result */ +-#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ +-#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ ++#define PCI_BIST 0x0f /* 8 bits */ ++#define PCI_BIST_CODE_MASK 0x0f /* Return result */ ++#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ ++#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ + + /* + * Base addresses specify locations in memory or I/O space. +@@ -71,38 +71,38 @@ + * 0xffffffff to the register, and reading it back. Only + * 1 bits are decoded. + */ +-#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ +-#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ +-#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ +-#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ +-#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ +-#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ +-#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ +-#define PCI_BASE_ADDRESS_SPACE_IO 0x01 +-#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 +-#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 +-#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ +-#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ +-#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ +-#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ +-#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) +-#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) ++#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ ++#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ ++#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ ++#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ ++#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ ++#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ ++#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ ++#define PCI_BASE_ADDRESS_SPACE_IO 0x01 ++#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 ++#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 ++#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ ++#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ ++#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ ++#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ ++#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) ++#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) + /* bit 1 is reserved if address_space = 1 */ + + /* Header type 0 (normal devices) */ +-#define PCI_CARDBUS_CIS 0x28 +-#define PCI_SUBSYSTEM_VENDOR_ID 0x2c +-#define PCI_SUBSYSTEM_ID 0x2e +-#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ +-#define PCI_ROM_ADDRESS_ENABLE 0x01 +-#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) ++#define PCI_CARDBUS_CIS 0x28 ++#define PCI_SUBSYSTEM_VENDOR_ID 0x2c ++#define PCI_SUBSYSTEM_ID 0x2e ++#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ ++#define PCI_ROM_ADDRESS_ENABLE 0x01 ++#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) + +-#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ ++#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ + + /* 0x35-0x3b are reserved */ +-#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ +-#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ +-#define PCI_MIN_GNT 0x3e /* 8 bits */ +-#define PCI_MAX_LAT 0x3f /* 8 bits */ ++#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ ++#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ ++#define PCI_MIN_GNT 0x3e /* 8 bits */ ++#define PCI_MAX_LAT 0x3f /* 8 bits */ + + #endif /* __HVMLOADER_PCI_REGS_H__ */ +diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h +--- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100 ++++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100 +@@ -32,157 +32,157 @@ + between 0xf0000 and 0xfffff. + */ + struct smbios_entry_point { +- char anchor_string[4]; +- uint8_t checksum; +- uint8_t length; +- uint8_t smbios_major_version; +- uint8_t smbios_minor_version; +- uint16_t max_structure_size; +- uint8_t entry_point_revision; +- uint8_t formatted_area[5]; +- char intermediate_anchor_string[5]; +- uint8_t intermediate_checksum; +- uint16_t structure_table_length; +- uint32_t structure_table_address; +- uint16_t number_of_structures; +- uint8_t smbios_bcd_revision; ++ char anchor_string[4]; ++ uint8_t checksum; ++ uint8_t length; ++ uint8_t smbios_major_version; ++ uint8_t smbios_minor_version; ++ uint16_t max_structure_size; ++ uint8_t entry_point_revision; ++ uint8_t formatted_area[5]; ++ char intermediate_anchor_string[5]; ++ uint8_t intermediate_checksum; ++ uint16_t structure_table_length; ++ uint32_t structure_table_address; ++ uint16_t number_of_structures; ++ uint8_t smbios_bcd_revision; + } __attribute__ ((packed)); + + /* This goes at the beginning of every SMBIOS structure. */ + struct smbios_structure_header { +- uint8_t type; +- uint8_t length; +- uint16_t handle; ++ uint8_t type; ++ uint8_t length; ++ uint16_t handle; + } __attribute__ ((packed)); + + /* SMBIOS type 0 - BIOS Information */ + struct smbios_type_0 { +- struct smbios_structure_header header; +- uint8_t vendor_str; +- uint8_t version_str; +- uint16_t starting_address_segment; +- uint8_t release_date_str; +- uint8_t rom_size; +- uint8_t characteristics[8]; +- uint8_t characteristics_extension_bytes[2]; +- uint8_t major_release; +- uint8_t minor_release; +- uint8_t embedded_controller_major; +- uint8_t embedded_controller_minor; ++ struct smbios_structure_header header; ++ uint8_t vendor_str; ++ uint8_t version_str; ++ uint16_t starting_address_segment; ++ uint8_t release_date_str; ++ uint8_t rom_size; ++ uint8_t characteristics[8]; ++ uint8_t characteristics_extension_bytes[2]; ++ uint8_t major_release; ++ uint8_t minor_release; ++ uint8_t embedded_controller_major; ++ uint8_t embedded_controller_minor; + } __attribute__ ((packed)); + + /* SMBIOS type 1 - System Information */ + struct smbios_type_1 { +- struct smbios_structure_header header; +- uint8_t manufacturer_str; +- uint8_t product_name_str; +- uint8_t version_str; +- uint8_t serial_number_str; +- uint8_t uuid[16]; +- uint8_t wake_up_type; +- uint8_t sku_str; +- uint8_t family_str; ++ struct smbios_structure_header header; ++ uint8_t manufacturer_str; ++ uint8_t product_name_str; ++ uint8_t version_str; ++ uint8_t serial_number_str; ++ uint8_t uuid[16]; ++ uint8_t wake_up_type; ++ uint8_t sku_str; ++ uint8_t family_str; + } __attribute__ ((packed)); + + /* SMBIOS type 3 - System Enclosure */ + struct smbios_type_3 { +- struct smbios_structure_header header; +- uint8_t manufacturer_str; +- uint8_t type; +- uint8_t version_str; +- uint8_t serial_number_str; +- uint8_t asset_tag_str; +- uint8_t boot_up_state; +- uint8_t power_supply_state; +- uint8_t thermal_state; +- uint8_t security_status; ++ struct smbios_structure_header header; ++ uint8_t manufacturer_str; ++ uint8_t type; ++ uint8_t version_str; ++ uint8_t serial_number_str; ++ uint8_t asset_tag_str; ++ uint8_t boot_up_state; ++ uint8_t power_supply_state; ++ uint8_t thermal_state; ++ uint8_t security_status; + } __attribute__ ((packed)); + + /* SMBIOS type 4 - Processor Information */ + struct smbios_type_4 { +- struct smbios_structure_header header; +- uint8_t socket_designation_str; +- uint8_t processor_type; +- uint8_t processor_family; +- uint8_t manufacturer_str; +- uint32_t cpuid[2]; +- uint8_t version_str; +- uint8_t voltage; +- uint16_t external_clock; +- uint16_t max_speed; +- uint16_t current_speed; +- uint8_t status; +- uint8_t upgrade; ++ struct smbios_structure_header header; ++ uint8_t socket_designation_str; ++ uint8_t processor_type; ++ uint8_t processor_family; ++ uint8_t manufacturer_str; ++ uint32_t cpuid[2]; ++ uint8_t version_str; ++ uint8_t voltage; ++ uint16_t external_clock; ++ uint16_t max_speed; ++ uint16_t current_speed; ++ uint8_t status; ++ uint8_t upgrade; + } __attribute__ ((packed)); + + /* SMBIOS type 11 - OEM Strings */ + struct smbios_type_11 { +- struct smbios_structure_header header; +- uint8_t count; ++ struct smbios_structure_header header; ++ uint8_t count; + } __attribute__ ((packed)); + + /* SMBIOS type 16 - Physical Memory Array + * Associated with one type 17 (Memory Device). + */ + struct smbios_type_16 { +- struct smbios_structure_header header; +- uint8_t location; +- uint8_t use; +- uint8_t error_correction; +- uint32_t maximum_capacity; +- uint16_t memory_error_information_handle; +- uint16_t number_of_memory_devices; ++ struct smbios_structure_header header; ++ uint8_t location; ++ uint8_t use; ++ uint8_t error_correction; ++ uint32_t maximum_capacity; ++ uint16_t memory_error_information_handle; ++ uint16_t number_of_memory_devices; + } __attribute__ ((packed)); + + /* SMBIOS type 17 - Memory Device + * Associated with one type 19 + */ + struct smbios_type_17 { +- struct smbios_structure_header header; +- uint16_t physical_memory_array_handle; +- uint16_t memory_error_information_handle; +- uint16_t total_width; +- uint16_t data_width; +- uint16_t size; +- uint8_t form_factor; +- uint8_t device_set; +- uint8_t device_locator_str; +- uint8_t bank_locator_str; +- uint8_t memory_type; +- uint16_t type_detail; ++ struct smbios_structure_header header; ++ uint16_t physical_memory_array_handle; ++ uint16_t memory_error_information_handle; ++ uint16_t total_width; ++ uint16_t data_width; ++ uint16_t size; ++ uint8_t form_factor; ++ uint8_t device_set; ++ uint8_t device_locator_str; ++ uint8_t bank_locator_str; ++ uint8_t memory_type; ++ uint16_t type_detail; + } __attribute__ ((packed)); + + /* SMBIOS type 19 - Memory Array Mapped Address */ + struct smbios_type_19 { +- struct smbios_structure_header header; +- uint32_t starting_address; +- uint32_t ending_address; +- uint16_t memory_array_handle; +- uint8_t partition_width; ++ struct smbios_structure_header header; ++ uint32_t starting_address; ++ uint32_t ending_address; ++ uint16_t memory_array_handle; ++ uint8_t partition_width; + } __attribute__ ((packed)); + + /* SMBIOS type 20 - Memory Device Mapped Address */ + struct smbios_type_20 { +- struct smbios_structure_header header; +- uint32_t starting_address; +- uint32_t ending_address; +- uint16_t memory_device_handle; +- uint16_t memory_array_mapped_address_handle; +- uint8_t partition_row_position; +- uint8_t interleave_position; +- uint8_t interleaved_data_depth; ++ struct smbios_structure_header header; ++ uint32_t starting_address; ++ uint32_t ending_address; ++ uint16_t memory_device_handle; ++ uint16_t memory_array_mapped_address_handle; ++ uint8_t partition_row_position; ++ uint8_t interleave_position; ++ uint8_t interleaved_data_depth; + } __attribute__ ((packed)); + + /* SMBIOS type 32 - System Boot Information */ + struct smbios_type_32 { +- struct smbios_structure_header header; +- uint8_t reserved[6]; +- uint8_t boot_status; ++ struct smbios_structure_header header; ++ uint8_t reserved[6]; ++ uint8_t boot_status; + } __attribute__ ((packed)); + + /* SMBIOS type 127 -- End-of-table */ + struct smbios_type_127 { +- struct smbios_structure_header header; ++ struct smbios_structure_header header; + } __attribute__ ((packed)); + + #endif /* SMBIOS_TYPES_H */ +diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c +--- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100 ++++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100 +@@ -125,11 +125,11 @@ + + int strncmp(const char *s1, const char *s2, uint32_t n) + { +- uint32_t ctr; +- for (ctr = 0; ctr < n; ctr++) +- if (s1[ctr] != s2[ctr]) +- return (int)(s1[ctr] - s2[ctr]); +- return 0; ++ uint32_t ctr; ++ for (ctr = 0; ctr < n; ctr++) ++ if (s1[ctr] != s2[ctr]) ++ return (int)(s1[ctr] - s2[ctr]); ++ return 0; + } + + void *memcpy(void *dest, const void *src, unsigned n) + diff --git a/main/xen/xencommons.initd b/main/xen/xencommons.initd new file mode 100755 index 0000000000..1ad0fb8c35 --- /dev/null +++ b/main/xen/xencommons.initd @@ -0,0 +1,91 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +opts="start stop status restart" + +if [ -d /etc/sysconfig ]; then + xencommons_config=/etc/sysconfig +else + xencommons_config=/etc/default +fi + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +#shopt -s extglob + +if test "x$1" = xstart && \ + test -d /proc/xen && \ + ! test -f /proc/xen/capabilities && \ + ! grep '^xenfs ' /proc/mounts >/dev/null; +then + mount -t xenfs xenfs /proc/xen +fi + +if ! grep -q "control_d" /proc/xen/capabilities ; then + exit 0 +fi + +depend() { + need net + before xend +} + +start() { + local time=0 + local timeout=30 + + if ! `xenstore-read -s / >/dev/null 2>&1` + then + test -z "$XENSTORED_ROOTDIR" || XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log" + + ebegin "Starting xenstored..." + xenstored --pid-file=/var/run/xenstored.pid $XENSTORED_ARGS + + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ; do + time=$(($time+1)) + sleep 1 + done + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + eend 1 + echo Could not start xenstored + exit 1 + fi + eend 0 + + ebegin "Setting domain 0 name..." + xenstore-write "/local/domain/0/name" "Domain-0" + eend $? + fi + + ebegin "Starting xenconsoled..." + test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" + xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + eend $? + + test -z "$XENBACKENDD_DEBUG" || XENBACKENDD_ARGS="-d" + test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS +} + +stop() { + ebegin "Stopping xenconsoled" + if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $XENCONSOLED_PIDFILE + fi + eend 0 + + echo WARNING: Not stopping xenstored, as it cannot be restarted. +} + +status() { + xenstore-read -s / >/dev/null 2>&1 +} diff --git a/main/xen/xend.initd b/main/xen/xend.initd index 6958c0479f..ee26c3f331 100644 --- a/main/xen/xend.initd +++ b/main/xen/xend.initd @@ -1,7 +1,7 @@ #!/sbin/runscript depend() { - need net + need net xencommons before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp } diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD index 53e282acb0..1a591b9f4d 100644 --- a/main/xfdesktop/APKBUILD +++ b/main/xfdesktop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfdesktop -pkgver=4.8.2 -pkgrel=1 +pkgver=4.8.3 +pkgrel=0 pkgdesc="A desktop manager for Xfce" url="http://www.xfce.org/" arch="all" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="ed25d59f478afda552d121e96657d16f xfdesktop-4.8.2.tar.bz2" +md5sums="617c667c469698e8c974e38412cb484c xfdesktop-4.8.3.tar.bz2" diff --git a/testing/awesome/0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch b/testing/awesome/0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch new file mode 100644 index 0000000000..0c1f4836c4 --- /dev/null +++ b/testing/awesome/0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch @@ -0,0 +1,587 @@ +From 33e140552786f20a34c15852e88aaa27f3bed029 Mon Sep 17 00:00:00 2001 +From: Arnaud Fontaine <arnau@debian.org> +Date: Wed, 27 Apr 2011 15:44:35 +0900 +Subject: [PATCH] Update the code following release of xcb-util 0.3.8. + +xcb-util is now split into several repositories since 0.3.8. This +release also cleaned up the API a lot, thus update the code +accordingly. + +Signed-off-by: Arnaud Fontaine <arnau@debian.org> +--- + awesome.c | 2 +- + awesomeConfig.cmake | 7 ++--- + client.c | 56 +++++++++++++++++++++--------------------- + client.h | 6 ++-- + common/xutil.c | 1 - + event.c | 10 +++--- + ewmh.c | 4 +- + property.c | 68 +++++++++++++++++++++++++------------------------- + selection.c | 14 +++++----- + systray.c | 2 +- + window.c | 4 +- + 11 files changed, 86 insertions(+), 88 deletions(-) + +diff --git a/awesome.c b/awesome.c +index f89080c..1258b4c 100644 +--- a/awesome.c ++++ b/awesome.c +@@ -154,7 +154,7 @@ scan(void) + + if(!attr_r || attr_r->override_redirect + || attr_r->map_state == XCB_MAP_STATE_UNMAPPED +- || state == XCB_WM_STATE_WITHDRAWN) ++ || state == XCB_ICCCM_WM_STATE_WITHDRAWN) + { + geom_wins[i] = NULL; + p_delete(&attr_r); +diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake +index 68b5ee3..5672afc 100644 +--- a/awesomeConfig.cmake ++++ b/awesomeConfig.cmake +@@ -127,7 +127,7 @@ execute_process( + + # Use pkgconfig to get most of the libraries + pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED +- xcb>=1.4) ++ xcb>=1.6) + + pkg_check_modules(AWESOME_REQUIRED REQUIRED + glib-2.0 +@@ -139,10 +139,9 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED + xcb-xtest + xcb-xinerama + xcb-shape +- xcb-aux>=0.3.0 +- xcb-atom>=0.3.0 ++ xcb-util>=0.3.8 + xcb-keysyms>=0.3.4 +- xcb-icccm>=0.3.6 ++ xcb-icccm>=0.3.8 + xcb-image>=0.3.0 + cairo-xcb + libstartup-notification-1.0>=0.10 +diff --git a/client.c b/client.c +index 049e3d5..baae69f 100644 +--- a/client.c ++++ b/client.c +@@ -52,7 +52,7 @@ luaA_client_gc(lua_State *L) + client_t *c = luaA_checkudata(L, 1, &client_class); + button_array_wipe(&c->buttons); + key_array_wipe(&c->keys); +- xcb_get_wm_protocols_reply_wipe(&c->protocols); ++ xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols); + p_delete(&c->machine); + p_delete(&c->class); + p_delete(&c->instance); +@@ -94,21 +94,21 @@ client_set_urgent(lua_State *L, int cidx, bool urgent) + if(c->urgent != urgent) + { + xcb_get_property_cookie_t hints = +- xcb_get_wm_hints_unchecked(globalconf.connection, c->window); ++ xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window); + + c->urgent = urgent; + ewmh_client_update_hints(c); + + /* update ICCCM hints */ +- xcb_wm_hints_t wmh; +- xcb_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL); ++ xcb_icccm_wm_hints_t wmh; ++ xcb_icccm_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL); + + if(urgent) +- wmh.flags |= XCB_WM_HINT_X_URGENCY; ++ wmh.flags |= XCB_ICCCM_WM_HINT_X_URGENCY; + else +- wmh.flags &= ~XCB_WM_HINT_X_URGENCY; ++ wmh.flags &= ~XCB_ICCCM_WM_HINT_X_URGENCY; + +- xcb_set_wm_hints(globalconf.connection, c->window, &wmh); ++ xcb_icccm_set_wm_hints(globalconf.connection, c->window, &wmh); + + hook_property(c, "urgent"); + luaA_object_emit_signal(L, cidx, "property::urgent", 0); +@@ -721,7 +721,7 @@ HANDLE_GEOM(height) + * + * At this stage it's just safer to keep it in normal state and avoid confusion. + */ +- window_state_set(c->window, XCB_WM_STATE_NORMAL); ++ window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL); + + if(!startup) + { +@@ -767,14 +767,14 @@ client_geometry_hints(client_t *c, area_t geometry) + int32_t real_basew = 0, real_baseh = 0; + + /* base size is substituted with min size if not specified */ +- if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE) + { + basew = c->size_hints.base_width; + baseh = c->size_hints.base_height; + real_basew = basew; + real_baseh = baseh; + } +- else if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) ++ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) + { + basew = c->size_hints.min_width; + baseh = c->size_hints.min_height; +@@ -783,12 +783,12 @@ client_geometry_hints(client_t *c, area_t geometry) + basew = baseh = 0; + + /* min size is substituted with base size if not specified */ +- if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) + { + minw = c->size_hints.min_width; + minh = c->size_hints.min_height; + } +- else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE) ++ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE) + { + minw = c->size_hints.base_width; + minh = c->size_hints.base_height; +@@ -796,7 +796,7 @@ client_geometry_hints(client_t *c, area_t geometry) + else + minw = minh = 0; + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT + && c->size_hints.min_aspect_den > 0 + && c->size_hints.max_aspect_den > 0 + && geometry.height - real_baseh > 0 +@@ -838,7 +838,7 @@ client_geometry_hints(client_t *c, area_t geometry) + if(minh) + geometry.height = MAX(geometry.height, minh); + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE) + { + if(c->size_hints.max_width) + geometry.width = MIN(geometry.width, c->size_hints.max_width); +@@ -846,7 +846,7 @@ client_geometry_hints(client_t *c, area_t geometry) + geometry.height = MIN(geometry.height, c->size_hints.max_height); + } + +- if(c->size_hints.flags & (XCB_SIZE_HINT_P_RESIZE_INC | XCB_SIZE_HINT_BASE_SIZE) ++ if(c->size_hints.flags & (XCB_ICCCM_SIZE_HINT_P_RESIZE_INC | XCB_ICCCM_SIZE_HINT_BASE_SIZE) + && c->size_hints.width_inc && c->size_hints.height_inc) + { + uint16_t t1 = geometry.width, t2 = geometry.height; +@@ -969,9 +969,9 @@ client_set_minimized(lua_State *L, int cidx, bool s) + c->minimized = s; + banning_need_update((c)->screen); + if(s) +- window_state_set(c->window, XCB_WM_STATE_ICONIC); ++ window_state_set(c->window, XCB_ICCCM_WM_STATE_ICONIC); + else +- window_state_set(c->window, XCB_WM_STATE_NORMAL); ++ window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL); + ewmh_client_update_hints(c); + if(strut_has_value(&c->strut)) + screen_emit_signal(globalconf.L, c->screen, "property::workarea", 0); +@@ -1333,7 +1333,7 @@ client_unmanage(client_t *c) + + /* Do this last to avoid races with clients. According to ICCCM, clients + * arent allowed to re-use the window until after this. */ +- window_state_set(c->window, XCB_WM_STATE_WITHDRAWN); ++ window_state_set(c->window, XCB_ICCCM_WM_STATE_WITHDRAWN); + + /* set client as invalid */ + c->invalid = true; +@@ -2052,9 +2052,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + + lua_createtable(L, 0, 1); + +- if(c->size_hints.flags & XCB_SIZE_HINT_US_POSITION) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION) + u_or_p = "user_position"; +- else if(c->size_hints.flags & XCB_SIZE_HINT_P_POSITION) ++ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION) + u_or_p = "program_position"; + + if(u_or_p) +@@ -2068,9 +2068,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + u_or_p = NULL; + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_US_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE) + u_or_p = "user_size"; +- else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE) ++ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE) + u_or_p = "program_size"; + + if(u_or_p) +@@ -2083,7 +2083,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, u_or_p); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) + { + lua_pushnumber(L, c->size_hints.min_width); + lua_setfield(L, -2, "min_width"); +@@ -2091,7 +2091,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, "min_height"); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE) + { + lua_pushnumber(L, c->size_hints.max_width); + lua_setfield(L, -2, "max_width"); +@@ -2099,7 +2099,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, "max_height"); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC) + { + lua_pushnumber(L, c->size_hints.width_inc); + lua_setfield(L, -2, "width_inc"); +@@ -2107,7 +2107,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, "height_inc"); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT) + { + lua_pushnumber(L, c->size_hints.min_aspect_num); + lua_setfield(L, -2, "min_aspect_num"); +@@ -2119,7 +2119,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, "max_aspect_den"); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_BASE_SIZE) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE) + { + lua_pushnumber(L, c->size_hints.base_width); + lua_setfield(L, -2, "base_width"); +@@ -2127,7 +2127,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c) + lua_setfield(L, -2, "base_height"); + } + +- if(c->size_hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY) ++ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_WIN_GRAVITY) + { + switch(c->size_hints.win_gravity) + { +diff --git a/client.h b/client.h +index d4ef52f..9674fac 100644 +--- a/client.h ++++ b/client.h +@@ -123,7 +123,7 @@ struct client_t + /** Window holding command needed to start it (session management related) */ + xcb_window_t leader_window; + /** Client's WM_PROTOCOLS property */ +- xcb_get_wm_protocols_reply_t protocols; ++ xcb_icccm_get_wm_protocols_reply_t protocols; + /** Client logical screen */ + screen_t *screen; + /** Client physical screen */ +@@ -248,8 +248,8 @@ client_raise(client_t *c) + static inline bool + client_isfixed(client_t *c) + { +- return (c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE +- && c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE ++ return (c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE ++ && c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE + && c->size_hints.max_width == c->size_hints.min_width + && c->size_hints.max_height == c->size_hints.min_height + && c->size_hints.max_width +diff --git a/common/xutil.c b/common/xutil.c +index 3d80e8d..c5a2127 100644 +--- a/common/xutil.c ++++ b/common/xutil.c +@@ -25,7 +25,6 @@ + #include "common/util.h" + + #include <xcb/xcb.h> +-#include <xcb/xcb_atom.h> + #include <xcb/xcb_icccm.h> + + #include "common/xutil.h" +diff --git a/event.c b/event.c +index 8527ec5..a35918b 100644 +--- a/event.c ++++ b/event.c +@@ -721,7 +721,7 @@ event_handle_clientmessage(xcb_client_message_event_t *ev) + client_t *c; + if((c = client_getbywin(ev->window)) + && ev->format == 32 +- && ev->data.data32[0] == XCB_WM_STATE_ICONIC) ++ && ev->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC) + { + luaA_object_push(globalconf.L, c); + client_set_minimized(globalconf.L, -1, true); +@@ -795,13 +795,13 @@ static void + xerror(xcb_generic_error_t *e) + { + /* ignore this */ +- if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW +- || (e->error_code == XCB_EVENT_ERROR_BAD_MATCH ++ if(e->error_code == XCB_WINDOW ++ || (e->error_code == XCB_MATCH + && e->major_code == XCB_SET_INPUT_FOCUS) +- || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE ++ || (e->error_code == XCB_VALUE + && e->major_code == XCB_KILL_CLIENT) + || (e->major_code == XCB_CONFIGURE_WINDOW +- && e->error_code == XCB_EVENT_ERROR_BAD_MATCH)) ++ && e->error_code == XCB_MATCH)) + return; + + warn("X error: request=%s, error=%s", +diff --git a/ewmh.c b/ewmh.c +index 0aa5de7..ba4776c 100644 +--- a/ewmh.c ++++ b/ewmh.c +@@ -226,7 +226,7 @@ ewmh_update_net_active_window(int phys_screen) + + xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, + xutil_screen_get(globalconf.connection, phys_screen)->root, +- _NET_ACTIVE_WINDOW, WINDOW, 32, 1, &win); ++ _NET_ACTIVE_WINDOW, XCB_ATOM_WINDOW, 32, 1, &win); + } + + static void +@@ -425,7 +425,7 @@ ewmh_client_update_hints(client_t *c) + state[i++] = _NET_WM_STATE_DEMANDS_ATTENTION; + + xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, +- c->window, _NET_WM_STATE, ATOM, 32, i, state); ++ c->window, _NET_WM_STATE, XCB_ATOM_ATOM, 32, i, state); + } + + /** Update the client active desktop. +diff --git a/property.c b/property.c +index d5090c6..d2223ef 100644 +--- a/property.c ++++ b/property.c +@@ -105,14 +105,14 @@ property_update_wm_transient_for(client_t *c, xcb_get_property_reply_t *reply) + + if(reply) + { +- if(!xcb_get_wm_transient_for_from_reply(&trans, reply)) ++ if(!xcb_icccm_get_wm_transient_for_from_reply(&trans, reply)) + return; + } + else + { +- if(!xcb_get_wm_transient_for_reply(globalconf.connection, +- xcb_get_wm_transient_for_unchecked(globalconf.connection, +- c->window), ++ if(!xcb_icccm_get_wm_transient_for_reply(globalconf.connection, ++ xcb_icccm_get_wm_transient_for_unchecked(globalconf.connection, ++ c->window), + &trans, NULL)) + return; + } +@@ -160,15 +160,15 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply) + { + if(reply) + { +- if(!xcb_get_wm_size_hints_from_reply(&c->size_hints, reply)) ++ if(!xcb_icccm_get_wm_size_hints_from_reply(&c->size_hints, reply)) + return; + } + else + { +- if(!xcb_get_wm_normal_hints_reply(globalconf.connection, +- xcb_get_wm_normal_hints_unchecked(globalconf.connection, +- c->window), +- &c->size_hints, NULL)) ++ if(!xcb_icccm_get_wm_normal_hints_reply(globalconf.connection, ++ xcb_icccm_get_wm_normal_hints_unchecked(globalconf.connection, ++ c->window), ++ &c->size_hints, NULL)) + return; + } + } +@@ -180,31 +180,31 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply) + void + property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply) + { +- xcb_wm_hints_t wmh; ++ xcb_icccm_wm_hints_t wmh; + + if(reply) + { +- if(!xcb_get_wm_hints_from_reply(&wmh, reply)) ++ if(!xcb_icccm_get_wm_hints_from_reply(&wmh, reply)) + return; + } + else + { +- if(!xcb_get_wm_hints_reply(globalconf.connection, +- xcb_get_wm_hints_unchecked(globalconf.connection, c->window), +- &wmh, NULL)) ++ if(!xcb_icccm_get_wm_hints_reply(globalconf.connection, ++ xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window), ++ &wmh, NULL)) + return; + } + + luaA_object_push(globalconf.L, c); +- client_set_urgent(globalconf.L, -1, xcb_wm_hints_get_urgency(&wmh)); +- if(wmh.flags & XCB_WM_HINT_STATE && +- wmh.initial_state == XCB_WM_STATE_WITHDRAWN) ++ client_set_urgent(globalconf.L, -1, xcb_icccm_wm_hints_get_urgency(&wmh)); ++ if(wmh.flags & XCB_ICCCM_WM_HINT_STATE && ++ wmh.initial_state == XCB_ICCCM_WM_STATE_WITHDRAWN) + client_set_border_width(globalconf.L, -1, 0); + +- if(wmh.flags & XCB_WM_HINT_INPUT) ++ if(wmh.flags & XCB_ICCCM_WM_HINT_INPUT) + c->nofocus = !wmh.input; + +- if(wmh.flags & XCB_WM_HINT_WINDOW_GROUP) ++ if(wmh.flags & XCB_ICCCM_WM_HINT_WINDOW_GROUP) + client_set_group_window(globalconf.L, -1, wmh.window_group); + + lua_pop(globalconf.L, 1); +@@ -217,18 +217,18 @@ property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply) + void + property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply) + { +- xcb_get_wm_class_reply_t hint; ++ xcb_icccm_get_wm_class_reply_t hint; + + if(reply) + { +- if(!xcb_get_wm_class_from_reply(&hint, reply)) ++ if(!xcb_icccm_get_wm_class_from_reply(&hint, reply)) + return; + } + else + { +- if(!xcb_get_wm_class_reply(globalconf.connection, +- xcb_get_wm_class_unchecked(globalconf.connection, c->window), +- &hint, NULL)) ++ if(!xcb_icccm_get_wm_class_reply(globalconf.connection, ++ xcb_icccm_get_wm_class_unchecked(globalconf.connection, c->window), ++ &hint, NULL)) + return; + } + +@@ -238,7 +238,7 @@ property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply) + + /* only delete reply if we get it ourselves */ + if(!reply) +- xcb_get_wm_class_reply_wipe(&hint); ++ xcb_icccm_get_wm_class_reply_wipe(&hint); + } + + static int +@@ -308,30 +308,30 @@ property_update_net_wm_pid(client_t *c, + void + property_update_wm_protocols(client_t *c, xcb_get_property_reply_t *reply) + { +- xcb_get_wm_protocols_reply_t protocols; ++ xcb_icccm_get_wm_protocols_reply_t protocols; + xcb_get_property_reply_t *reply_copy; + + if(reply) + { + reply_copy = p_dup(reply, 1); + +- if(!xcb_get_wm_protocols_from_reply(reply_copy, &protocols)) +- { ++ if(!xcb_icccm_get_wm_protocols_from_reply(reply_copy, &protocols)) ++ { + p_delete(&reply_copy); + return; +- } ++ } + } + else + { + /* If this fails for any reason, we still got the old value */ +- if(!xcb_get_wm_protocols_reply(globalconf.connection, +- xcb_get_wm_protocols_unchecked(globalconf.connection, +- c->window, WM_PROTOCOLS), +- &protocols, NULL)) ++ if(!xcb_icccm_get_wm_protocols_reply(globalconf.connection, ++ xcb_icccm_get_wm_protocols_unchecked(globalconf.connection, ++ c->window, WM_PROTOCOLS), ++ &protocols, NULL)) + return; + } + +- xcb_get_wm_protocols_reply_wipe(&c->protocols); ++ xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols); + memcpy(&c->protocols, &protocols, sizeof(protocols)); + } + +diff --git a/selection.c b/selection.c +index 527ec40..44b57c5 100644 +--- a/selection.c ++++ b/selection.c +@@ -86,18 +86,18 @@ luaA_selection_get(lua_State *L) + if(event_notify->selection == XCB_ATOM_PRIMARY + && event_notify->property != XCB_NONE) + { +- xcb_get_text_property_reply_t prop; ++ xcb_icccm_get_text_property_reply_t prop; + xcb_get_property_cookie_t cookie = +- xcb_get_text_property(globalconf.connection, +- event_notify->requestor, +- event_notify->property); ++ xcb_icccm_get_text_property(globalconf.connection, ++ event_notify->requestor, ++ event_notify->property); + +- if(xcb_get_text_property_reply(globalconf.connection, +- cookie, &prop, NULL)) ++ if(xcb_icccm_get_text_property_reply(globalconf.connection, ++ cookie, &prop, NULL)) + { + lua_pushlstring(L, prop.name, prop.name_len); + +- xcb_get_text_property_reply_wipe(&prop); ++ xcb_icccm_get_text_property_reply_wipe(&prop); + + xcb_delete_property(globalconf.connection, + event_notify->requestor, +diff --git a/systray.c b/systray.c +index 6ea3dd5..92b7d39 100644 +--- a/systray.c ++++ b/systray.c +@@ -197,7 +197,7 @@ systray_request_handle(xcb_window_t embed_win, int phys_screen, xembed_info_t *i + + xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK, + select_input_val); +- window_state_set(embed_win, XCB_WM_STATE_WITHDRAWN); ++ window_state_set(embed_win, XCB_ICCCM_WM_STATE_WITHDRAWN); + + /* we grab the window, but also make sure it's automatically reparented back + * to the root window if we should die. +diff --git a/window.c b/window.c +index b86fa38..6a1909f 100644 +--- a/window.c ++++ b/window.c +@@ -60,7 +60,7 @@ uint32_t + window_state_get_reply(xcb_get_property_cookie_t cookie) + { + /* If no property is set, we just assume a sane default. */ +- uint32_t result = XCB_WM_STATE_NORMAL; ++ uint32_t result = XCB_ICCCM_WM_STATE_NORMAL; + xcb_get_property_reply_t *prop_r; + + if((prop_r = xcb_get_property_reply(globalconf.connection, cookie, NULL))) +@@ -187,7 +187,7 @@ window_opacity_set(xcb_window_t win, double opacity) + { + uint32_t real_opacity = opacity * 0xffffffff; + xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, win, +- _NET_WM_WINDOW_OPACITY, CARDINAL, 32, 1L, &real_opacity); ++ _NET_WM_WINDOW_OPACITY, XCB_ATOM_CARDINAL, 32, 1L, &real_opacity); + } + else + xcb_delete_property(globalconf.connection, win, _NET_WM_WINDOW_OPACITY); +-- +1.7.4.4 + diff --git a/testing/awesome/APKBUILD b/testing/awesome/APKBUILD index 43531bf08d..7a1bb05aba 100644 --- a/testing/awesome/APKBUILD +++ b/testing/awesome/APKBUILD @@ -1,18 +1,20 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=awesome -pkgver=3.4.9 -pkgrel=1 +pkgver=3.4.10 +pkgrel=0 pkgdesc="lua-configurable window manager framework" url="http://awesome.naquadah.org/" arch="all" license="GPL" depends="imagemagick" -makedepends="lua-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev" +makedepends="lua-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev + imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev + xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev" install="" subpackages="$pkgname-doc" source="http://awesome.naquadah.org/download/${pkgname}-${pkgver}.tar.bz2 - cmake.patch + 0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch " _srcdir="${srcdir}/${pkgname}-${pkgver}" @@ -39,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="a3e8f22fb4d17dd1cda90b354be84d6f awesome-3.4.9.tar.bz2 -3382b552d0519c8637c86b2e61f1e052 cmake.patch" +md5sums="245087f8065867eff37a2133287d5c03 awesome-3.4.10.tar.bz2 +354637fd9dafa0500fef3f01a0e73d8a 0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch" diff --git a/testing/awesome/cmake.patch b/testing/awesome/cmake.patch deleted file mode 100644 index c2762374ed..0000000000 --- a/testing/awesome/cmake.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 8b6adbffead83c9d77c493174d0f5b6a97f2a9e9 -Author: Thomas Moschny <thomas.moschny@gmx.de> -Date: Mon Feb 21 17:58:04 2011 +0100 - - Normalize icon path names (fixes #869). - - The elements in ${icon_sources}, as returned by file(GLOB ...) contain - double slashes, could be a bug in cmake. This causes building with - cmake 2.8.4 to fail, due to dependency problems lateron. - - This patch works around the issue by normalizing all path names in - ${icon_sources} while appending them to ${ALL_ICONS}, thereby removing - the double slashes. - - Signed-off-by: Uli Schlachter <psychon@znc.in> - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64be9b9..472bec2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,14 +244,15 @@ endif() - - # {{{ Theme icons - file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png) --set(ALL_ICONS ${icon_sources}) - - foreach(icon ${icon_sources}) - # Copy all icons to the build dir to simplify the following code. - # Source paths are interpreted relative to ${SOURCE_DIR}, target paths - # relative to ${BUILD_DIR}. - get_filename_component(icon_path ${icon} PATH) -+ get_filename_component(icon_name ${icon} NAME) - file(COPY ${icon} DESTINATION ${icon_path}) -+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}") - endforeach() - - macro(a_icon_convert match replacement input) diff --git a/testing/ddrescue/APKBUILD b/testing/ddrescue/APKBUILD new file mode 100644 index 0000000000..bc85d650e0 --- /dev/null +++ b/testing/ddrescue/APKBUILD @@ -0,0 +1,42 @@ +# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> +pkgname=ddrescue +pkgver=1.12 +pkgrel=0 +pkgdesc="Data recovery tool for block devices with errors" +url="http://www.gnu.org/s/ddrescue/ddrescue.html" +arch="all" +license="GPL" +depends= +depends_dev= +makedepends="$depends_dev" +install= +subpackages="$pkgname-doc" +source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" + + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + return 0 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + # remove the 2 lines below (and this) if there is no init.d script + # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="b3d8a9a9098b87939fba05a45848bd8d ddrescue-1.12.tar.gz" diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD index f8f0d12228..06f7cc6941 100644 --- a/testing/gnash/APKBUILD +++ b/testing/gnash/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=gnash pkgver=0.8.9 -pkgrel=4 +pkgrel=5 pkgdesc="GNU flash player implementation" url="http://www.gnashdev.org/" arch="all" diff --git a/testing/hydrogen/APKBUILD b/testing/hydrogen/APKBUILD new file mode 100644 index 0000000000..db4ea7708a --- /dev/null +++ b/testing/hydrogen/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=hydrogen +pkgver=0.9.5 +pkgrel=1 +pkgdesc="Advanced drum machine for GNU/Linux" +url="http://www.hydrogen-music.org/" +arch="all" +license="GPLv2+" +depends="" +makedepends="qt-dev alsa-lib-dev flac-dev libsndfile-dev scons portaudio-dev + libarchive-dev" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/hydrogen/hydrogen-$pkgver.tar.gz + hydrogen-docdir.patch" + +_builddir="$srcdir"/hydrogen-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + patch -p0 -i patches/portaudio.patch || return 1 +} + +build() { + cd "$_builddir" + export QTDIR=/usr/lib + scons -j${JOBS:-2} \ + prefix=/usr \ + jack=0 \ + portaudio=1 \ + libarchive=1 \ + portmidi=0 \ + lash=0 \ + lrdf=0 \ + oss=0 \ + optflags="$CFLAGS" \ + || return 1 +} + +package() { + cd "$_builddir" + export QTDIR=/usr/lib + scons -j ${JOBS:-2} install DESTDIR="$pkgdir" || return 1 +} + +md5sums="e96f291d60e58f5d62fe616cee577dc0 hydrogen-0.9.5.tar.gz +0d9552ee114f57df67d677263816ec78 hydrogen-docdir.patch" diff --git a/testing/hydrogen/hydrogen-docdir.patch b/testing/hydrogen/hydrogen-docdir.patch new file mode 100644 index 0000000000..71c6a6d86c --- /dev/null +++ b/testing/hydrogen/hydrogen-docdir.patch @@ -0,0 +1,11 @@ +--- ./Sconstruct.orig ++++ ./Sconstruct +@@ -309,7 +309,7 @@ + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/hydrogen.default.conf")) + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/emptySample.wav")) + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/click.wav")) +- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/doc")) ++ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/doc/hydrogen', source="./data/doc")) + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/DefaultSong.h2song")) + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/bin/', source="./hydrogen")) + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/applications', source="./hydrogen.desktop")) diff --git a/testing/jwm/APKBUILD b/testing/jwm/APKBUILD new file mode 100644 index 0000000000..7ccb28c088 --- /dev/null +++ b/testing/jwm/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Jeff Pohlmeyer <yetanothergeek@gmail.com> +# Maintainer: Jeff Pohlmeyer <yetanothergeek@gmail.com> + +pkgname=jwm +pkgver=501 +pkgrel=1 +pkgdesc="A lightweight window manager for the X11 Window System" +url="http://joewing.net/programs/jwm/" +arch="all" +license="GPL" +depends= +depends_dev="libx11-dev libxext-dev libxft-dev libxmu-dev libxinerama-dev + libxpm-dev libxrender-dev jpeg-dev libpng-dev" +makedepends="$depends_dev" +install= +subpackages="$pkgname-doc" +source="http://joewing.net/programs/jwm/snapshots/$pkgname-$pkgver.tar.bz2" + + +_builddir="$srcdir"/$pkgname-$pkgver + + +build() { + cd "$_builddir" + ./configure \ + --prefix=/usr \ + --enable-confirm \ + --enable-icons \ + --enable-png \ + --enable-jpeg \ + --enable-xpm \ + --enable-xft \ + --enable-xrender \ + --enable-shape \ + --enable-xmu \ + --enable-xinerama \ + --disable-fribidi \ + --disable-debug || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make \ + BINDIR="$pkgdir/usr/bin" \ + MANDIR="$pkgdir/usr/share/man" \ + SYSCONF="$pkgdir/etc" install || return 1 +} + +md5sums="19f05789750674b10007c58264e6c688 jwm-501.tar.bz2" diff --git a/testing/lua-curses/APKBUILD b/testing/lua-curses/APKBUILD new file mode 100644 index 0000000000..32173a214c --- /dev/null +++ b/testing/lua-curses/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=lua-curses +pkgver=7 +pkgrel=0 +pkgdesc="ncurses binding for Lua" +url="http://luaforge.net/projects/lcurses" +arch="all" +license="BSD" +depends="" +makedepends="lua-dev ncurses-dev" +install="" +subpackages= +source="http://luaforge.net/frs/download.php/4843/lcurses-$pkgver.tar.gz" + +_builddir="$srcdir"/lcurses-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/lua/*/*.*a +} + +md5sums="5268b69548f113fa8205fd9dd86b89b3 lcurses-7.tar.gz" diff --git a/testing/lxterminal/APKBUILD b/testing/lxterminal/APKBUILD new file mode 100644 index 0000000000..a07a8cc411 --- /dev/null +++ b/testing/lxterminal/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=lxterminal +pkgver=0.1.11 +pkgrel=0 +pkgdesc="Desktop-independent VTE-based terminal emulator" +url="http://lxde.sourceforge.net/" +arch="all" +license="GPLv2+" +depends="" +makedepends="vte-dev" +install="" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/sourceforge/lxde/lxterminal-$pkgver.tar.gz" + +_builddir="$srcdir"/lxterminal-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="fd9140b45c0f28d021253c4aeb8c4aea lxterminal-0.1.11.tar.gz" diff --git a/testing/ntfsprogs/APKBUILD b/testing/ntfsprogs/APKBUILD new file mode 100644 index 0000000000..df79553ebe --- /dev/null +++ b/testing/ntfsprogs/APKBUILD @@ -0,0 +1,39 @@ +# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> +pkgname=ntfsprogs +pkgver=2.0.0 +pkgrel=0 +pkgdesc="User space utilities for NTFS partitions" +url="http://sourceforge.net/projects/linux-ntfs/" +arch="all" +license="GPL" +depends= +depends_dev= +makedepends="$depends_dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://downloads.sourceforge.net/project/linux-ntfs/NTFS%20Tools%20and%20Library/2.0.0/$pkgname-$pkgver.tar.gz" + + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + return 0 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + find $pkgdir -iname *.la -delete +} + +md5sums="2c402b647bb7aeb1d3f8ce1cc354fd68 ntfsprogs-2.0.0.tar.gz" diff --git a/testing/partclone/APKBUILD b/testing/partclone/APKBUILD index 5855d2b09d..e5a3813524 100644 --- a/testing/partclone/APKBUILD +++ b/testing/partclone/APKBUILD @@ -1,13 +1,14 @@ +# Contributor: Leonardo Arena <rnarld@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=partclone pkgver=0.2.24 -pkgrel=0 +pkgrel=1 pkgdesc="Partition cloning tool" url="http://partclone.org/" arch="all" license="GPL" depends= -makedepends="e2fsprogs-dev ncurses-dev" +makedepends="e2fsprogs-dev ncurses-dev ntfsprogs-dev" install="" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/project/partclone/testing/src/partclone-$pkgver.tar.gz @@ -15,7 +16,6 @@ source="http://downloads.sourceforge.net/project/partclone/testing/src/partclone # TODO: # libreiserfs: http://reiserfs.linux.kiev.ua -# ntfsprogs: http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.bz2 # _builddir="$srcdir"/partclone-$pkgver @@ -52,6 +52,7 @@ build() { --localstatedir=/var \ --enable-extfs \ --enable-fat \ + --enable-ntfs \ --enable-ncursesw \ --disable-nls \ || return 1 diff --git a/testing/pastebinc/APKBUILD b/testing/pastebinc/APKBUILD index d40962f0b7..65eaddbc9c 100644 --- a/testing/pastebinc/APKBUILD +++ b/testing/pastebinc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com> pkgname=pastebinc -pkgver=0.9 +pkgver=0.9.1 pkgrel=0 pkgdesc="utility to pipe data into a paste on pastebin.com or a similar site" url="https://github.com/jthomerson/pastebinc" @@ -12,8 +12,8 @@ depends_dev= makedepends="wget glib-dev curl-dev" install="" subpackages="" -source="saveas-https://github.com/jthomerson/pastebinc/tarball/RELEASE_0.9-BETA/$pkgname-$pkgver-$pkgrel.tar.gz" -_builddir="$srcdir/jthomerson-pastebinc-8dbb86b" +source="saveas-https://github.com/jthomerson/pastebinc/tarball/RELEASE_0.9.1/$pkgname-$pkgver-$pkgrel.tar.gz" +_builddir="$srcdir/jthomerson-pastebinc-e16f22d" makeparams="VERSION=$pkgver-$pkgrel CONFDIR=/etc/pastebinc" @@ -38,4 +38,4 @@ package() { make $makeparams DESTDIR="$pkgdir" install || return 1 } -md5sums="a1620a9d04ecb79f42ede3768987567a pastebinc-0.9-0.tar.gz" +md5sums="68a1c51b2fa39ecb6fd29a14f2e9f591 pastebinc-0.9.1-0.tar.gz" diff --git a/testing/postfixadmin/APKBUILD b/testing/postfixadmin/APKBUILD new file mode 100644 index 0000000000..8043f1a0d5 --- /dev/null +++ b/testing/postfixadmin/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=postfixadmin +pkgver=2.3.3 +pkgrel=0 +pkgdesc="Web Based Management tool for Postfix" +url="http://postfixadmin.com/" +arch="noarch" +license="GPL" +depends="php postfix" +makedepends="" +install="" +subpackages="" +source="http://downloads.sourceforge.net/project/postfixadmin/postfixadmin/postfixadmin-$pkgver/postfixadmin-$pkgver.tar.gz" + +_builddir="$srcdir"/postfixadmin-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/share/webapps/postfixadmin \ + "$pkgdir"/etc/postfixadmin + cp -r * "$pkgdir"/usr/share/webapps/postfixadmin/ + + # move config to /etc/postfixadmin and create symlink + mv "$pkgdir"/usr/share/webapps/postfixadmin/config.inc.php \ + "$pkgdir"/etc/postfixadmin/ + ln -s /etc/postfixadmin/config.inc.php \ + "$pkgdir"/usr/share/webapps/postfixadmin/config.inc.php +} + +md5sums="0dfcd8a4535e00aced45c82dbcedf859 postfixadmin-2.3.3.tar.gz" diff --git a/testing/squid/APKBUILD b/testing/squid/APKBUILD new file mode 100644 index 0000000000..e7b887944c --- /dev/null +++ b/testing/squid/APKBUILD @@ -0,0 +1,285 @@ +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=squid +pkgver=3.2.0.11 +pkgrel=0 +pkgdesc="A full-featured Web proxy cache server." +url="http://www.squid-cache.org" +install="squid.pre-install squid.pre-upgrade squid.post-install" +pkgusers="squid" +pkggroups="squid" +arch="all" +license="GPL-2" +depends="logrotate" +makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool + libcap-dev" +subpackages="$pkgname-doc" +linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ko lt + lv ms nl oc pl pt ro ru sk sl sr sv th tr uk uz vi zh" +langdir="/usr/share/squid/errors" + +source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2 + squid.initd + squid.confd + $pkgname.logrotate + " + +pkgusers="squid" +pkggroups="squid" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +# ./bootstrap.sh +} + +build() { + cd "$_builddir" + + ./configure --prefix=/usr \ + --datadir=/usr/share/squid \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --disable-strict-error-checking \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" \ + --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ + --enable-epoll \ + --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ + --enable-ntlm-auth-helpers="fakeauth,no_check,smb_lm" \ + --enable-negotiate-auth-helpers="squid_kerb_auth" \ + --disable-mit \ + --enable-heimdal \ + --enable-delay-pools \ + --enable-arp-acl \ + --enable-ssl \ + --enable-linux-netfilter \ + --enable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-referer-log \ + --enable-async-io \ + --enable-truncate \ + --enable-arp-acl \ + --enable-htcp \ + --enable-carp \ + --enable-poll --with-maxfd=4096 \ + --enable-follow-x-forwarded-for \ + --with-large-files \ + || return 1 + + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.logrotate \ + "$pkgdir"/etc/logrotate.d/squid + + install -d -o squid -g squid \ + "$pkgdir"/var/cache/squid \ + "$pkgdir"/var/log/squid \ + "$pkgdir"/var/run/squid + chmod +x "$pkgdir"/usr/lib/squid/* +} + +squid_kerb_auth() { + pkgdesc="Squid kerberos authetication helper" + install -d "$subpkgdir"/usr/lib/squid + mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ +} + +_mv_error() { + local d=usr/share/squid/errors + mkdir -p "$subpkgdir/$d" + mv "$pkgdir/$d/${1}" "$subpkgdir/$d/" || return 1 + # last one removed the dir + rmdir "$pkgdir/$d" 2>/dev/null + return 0 +} + +errors_armenian() { + depends="$pkgname" + _mv_error Armenian +} + +errors_azerbaijani() { + depends="$pkgname" + _mv_error Azerbaijani +} + +errors_bulgarian() { + depends="$pkgname" + _mv_error Bulgarian +} + +errors_catalan() { + depends="$pkgname" + _mv_error Catalan +} + +errors_czech() { + depends="$pkgname" + _mv_error Czech +} + +errors_danish() { + depends="$pkgname" + _mv_error Danish +} + +errors_dutch() { + depends="$pkgname" + _mv_error Dutch +} + +errors_english() { + depends= + _mv_error English +} + +errors_estonian() { + depends="$pkgname" + _mv_error Estonian +} + +errors_finnish() { + depends="$pkgname" + _mv_error Finnish +} + +errors_french() { + depends="$pkgname" + _mv_error French +} + +errors_german() { + depends="$pkgname" + _mv_error German +} + +errors_greek() { + depends="$pkgname" + _mv_error Greek +} + +errors_hebrew() { + depends="$pkgname" + _mv_error Hebrew +} + +errors_hungarian() { + depends="$pkgname" + _mv_error Hungarian +} + +errors_italian() { + depends="$pkgname" + _mv_error Italian +} + +errors_japanese() { + depends="$pkgname" + _mv_error Japanese +} + +errors_korean() { + depends="$pkgname" + _mv_error Korean +} + +errors_lithuanian() { + depends="$pkgname" + _mv_error Lithuanian +} + +errors_polish() { + depends="$pkgname" + _mv_error Polish +} + +errors_portuguese() { + depends="$pkgname" + _mv_error Portuguese +} + +errors_romanian() { + depends="$pkgname" + _mv_error Romanian +} + +errors_russian_1251() { + depends="$pkgname" + _mv_error Russian-1251 +} + +errors_russian_koi8_r() { + depends="$pkgname" + _mv_error Russian-koi8-r +} + +errors_serbian() { + depends="$pkgname" + _mv_error Serbian +} + +errors_simplify_chinese() { + depends="$pkgname" + _mv_error Simplify_Chinese +} + +errors_slovak() { + depends="$pkgname" + _mv_error Slovak +} + +errors_spanish() { + depends="$pkgname" + _mv_error Spanish +} + +errors_swedish() { + depends="$pkgname" + _mv_error Swedish +} + +errors_traditional_chinese() { + depends="$pkgname" + _mv_error Traditional_Chinese +} + +errors_turkish() { + depends="$pkgname" + _mv_error Turkish +} + +errors_ukrainian_1251() { + depends="$pkgname" + _mv_error Ukrainian-1251 +} + +errors_ukrainian_koi8_u() { + depends="$pkgname" + _mv_error Ukrainian-koi8-u +} + +errors_ukrainian_utf8() { + depends="$pkgname" + _mv_error Ukrainian-utf8 +} + + +md5sums="51d8434bb2f036d993d6b3ddb047afd7 squid-3.2.0.11.tar.bz2 +57fed05adc40acab6a5480ec7a014154 squid.initd +44b052db7910f386ef88ddcf69c9ba4e squid.confd +58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" diff --git a/testing/squid/squid.confd b/testing/squid/squid.confd new file mode 100644 index 0000000000..14a9ee84bd --- /dev/null +++ b/testing/squid/squid.confd @@ -0,0 +1,15 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.2 2008/11/30 19:20:44 mrness Exp $ + +# Config file for /etc/init.d/squid + +SQUID_OPTS="-DYC" + +# Max. number of filedescriptors to use. You can increase this on a busy +# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024. +SQUID_MAXFD=1024 + +# Kerberos keytab file to use. This is required if you enable kerberos authentication. +SQUID_KEYTAB="" + diff --git a/testing/squid/squid.initd b/testing/squid/squid.initd new file mode 100644 index 0000000000..2eaf1dd2af --- /dev/null +++ b/testing/squid/squid.initd @@ -0,0 +1,115 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.10 2008/11/30 19:20:44 mrness Exp $ + +opts="${opts} reload rotate" + +conf=/etc/squid/squid.conf + +depend() { + need net + after firewall +} + +# Try to increase the # of filedescriptors we can open. +maxfds() { + [ -n "$SQUID_MAXFD" ] || return + [ -f /proc/sys/fs/file-max ] || return 0 + [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 + local global_file_max=`cat /proc/sys/fs/file-max` + local minimal_file_max=$(($SQUID_MAXFD + 4096)) + if [ "$global_file_max" -lt $minimal_file_max ]; then + echo $minimal_file_max > /proc/sys/fs/file-max + fi + ulimit -n $SQUID_MAXFD +} + +checkconfig() { + maxfds + + local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < $conf) + [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" + + local x + for x in $CACHE_SWAP ; do + if [ ! -e $x ] ; then + ebegin "Initializing cache directories" + local ORIG_UMASK=$(umask) + umask 027 + local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -D 2>&1)" + if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then + umask $ORIG_UMASK + eend 1 + echo "$INIT_CACHE_RESPONSE" + return 1 + fi + umask $ORIG_UMASK + eend 0 + break + fi + done + + squid -k parse +} + +get_pidfile() { + PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ {print $2}' $conf) + [ -z "$PIDFILE" ] && PIDFILE=/var/run/squid/squid.pid +} + +start() { + get_pidfile + checkconfig || return 1 + ebegin "Starting squid" + start-stop-daemon --start --pidfile "$PIDFILE" \ + --env KRB5_KTNAME="${SQUID_KEYTAB}" \ + --exec /usr/sbin/squid -- ${SQUID_OPTS} + eend $? && sleep 1 +} + +stop() { + local rc=0 pid + ebegin "Stopping squid" + get_pidfile + /usr/sbin/squid -k shutdown + + # Now we have to wait until squid has _really_ stopped. + if [ -f "$PIDFILE" ] ; then + pid=$(cat "$PIDFILE") + if [ -d /proc/$pid ]; then + einfon "Waiting for squid to shutdown ." + else + rm -f "$PIDFILE" + fi + cnt=0 + while [ -f "$PIDFILE" ] ; do + cnt=$(expr $cnt + 1) + if [ $cnt -gt 60 ] ; then + # Waited 120 seconds now. Fail. + echo + rc=1 + break + fi + sleep 2 + echo -n "." + done + echo + fi + eend $rc +} + +reload() { + checkconfig || return 1 + ebegin "Reloading squid" + /usr/sbin/squid -k reconfigure + eend $? +} + +rotate() { + service_started squid || return 1 + ebegin "Rotating logs" + /usr/sbin/squid -k rotate + eend $? +} + diff --git a/testing/squid/squid.logrotate b/testing/squid/squid.logrotate new file mode 100644 index 0000000000..fb3279e013 --- /dev/null +++ b/testing/squid/squid.logrotate @@ -0,0 +1,11 @@ +/var/log/squid/*.log { + daily + compress + rotate 5 + missingok + nocreate + sharedscripts + postrotate + /usr/sbin/squid -k rotate + endscript +} diff --git a/testing/squid/squid.post-install b/testing/squid/squid.post-install new file mode 100644 index 0000000000..88df6d26f9 --- /dev/null +++ b/testing/squid/squid.post-install @@ -0,0 +1,5 @@ +#!/bin/sh + +chown squid:squid /var/cache/squid /var/log/squid +exit 0 + diff --git a/testing/squid/squid.pre-install b/testing/squid/squid.pre-install new file mode 100644 index 0000000000..322d21deab --- /dev/null +++ b/testing/squid/squid.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +adduser -D squid -H /var/cache/squid 2>/dev/null +addgroup winbind 2>/dev/null +addgroup squid winbind +exit 0 diff --git a/testing/squid/squid.pre-upgrade b/testing/squid/squid.pre-upgrade new file mode 100644 index 0000000000..322d21deab --- /dev/null +++ b/testing/squid/squid.pre-upgrade @@ -0,0 +1,6 @@ +#!/bin/sh + +adduser -D squid -H /var/cache/squid 2>/dev/null +addgroup winbind 2>/dev/null +addgroup squid winbind +exit 0 diff --git a/testing/wine_gecko/APKBUILD b/testing/wine_gecko/APKBUILD new file mode 100644 index 0000000000..331b7f8961 --- /dev/null +++ b/testing/wine_gecko/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wine_gecko +pkgver=1.3 +pkgrel=0 +pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" +url="http://wiki.winehq.org/Gecko" +arch="x86" +license="MPL" +depends="" +makedepends="" +install="" +subpackages="" +source="http://downloads.sourceforge.net/wine/wine_gecko-$pkgver-$CARCH.msi" + +_builddir= +prepare() { + mkdir -p "$srcdir" +} + +build() { + return 0 +} + +package() { + mkdir -p "$pkgdir"/usr/share/wine/gecko/ + cp -a "$srcdir"/wine_gecko-$pkgver-$CARCH.msi \ + "$pkgdir"/usr/share/wine/gecko/ +} + +md5sums="9e21684bb68d016b837744d53abb2fde wine_gecko-1.3-x86.msi" |