diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2009-04-14 12:31:40 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2009-04-14 12:31:40 +0000 |
commit | d1d77566acd00b507e94315db03962d40d5e61ba (patch) | |
tree | 143220614c31d23846d5997e013a54dcfb610bae /extra | |
parent | ec9f198db36b85dbd15d437912f54351fb6dac4e (diff) | |
parent | dc25b81229d7f15420c73579221a02af5357b8fb (diff) | |
download | aports-d1d77566acd00b507e94315db03962d40d5e61ba.tar.bz2 aports-d1d77566acd00b507e94315db03962d40d5e61ba.tar.xz |
Merge commit 'ncopa/master'
Conflicts:
core/e2fsprogs/APKBUILD
extra/nfs-utils/APKBUILD
Diffstat (limited to 'extra')
30 files changed, 277 insertions, 275 deletions
diff --git a/extra/alsa-lib/APKBUILD b/extra/alsa-lib/APKBUILD index d253ca85d0..7bb0b7bec4 100644 --- a/extra/alsa-lib/APKBUILD +++ b/extra/alsa-lib/APKBUILD @@ -1,19 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alsa-lib -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=0 pkgdesc="An alternative implementation of Linux sound support" url="http://www.alsa-project.org" license="GPL" depends="uclibc" subpackages="$pkgname-dev" -source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2" +source="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 + nocxx.patch" build () { cd "$srcdir/$pkgname-$pkgver" + patch configure < ../nocxx.patch || return 1 ./configure --prefix=/usr --disable-python make || return 1 make -j1 DESTDIR="$pkgdir" install } -md5sums="de60df7541fafe8c6a3397e0f105ff0e alsa-lib-1.0.18.tar.bz2" +md5sums="73db3666c211e5fb023bb77450cf430d alsa-lib-1.0.19.tar.bz2 +28513788ba4d556ccd538867dc6205ab nocxx.patch" diff --git a/extra/alsa-lib/nocxx.patch b/extra/alsa-lib/nocxx.patch new file mode 100644 index 0000000000..beb1ab9006 --- /dev/null +++ b/extra/alsa-lib/nocxx.patch @@ -0,0 +1,15 @@ +--- a/configure 2004-12-07 21:34:23.205172545 +0000 ++++ b/configure 2004-12-07 21:37:17.726654782 +0000 +@@ -5148,10 +5148,8 @@ + : + else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++See \`config.log' for more details." >&5;} ++ { echo "C++ sucks, ignoring ..." >&5; }; } + fi + + ac_ext=cc diff --git a/extra/bridge-utils/APKBUILD b/extra/bridge-utils/APKBUILD new file mode 100644 index 0000000000..0caaed9bcf --- /dev/null +++ b/extra/bridge-utils/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=bridge-utils +pkgver=1.4 +pkgrel=0 +pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +url="http://bridge.sourceforge.net/" +license="GPL-2" +subpackages="$pkgname-dev $pkgname-doc" +depends="uclibc" +makedepends="autoconf" +source="http://download.sourceforge.net/bridge/$pkgname-$pkgver.tar.gz" + +build() { + cd "$srcdir"/$pkgname-$pkgver + autoconf + # src_compile + configure --prefix=/ \ + --mandir=/usr/share/man \ + --libdir=/usr/lib \ + --includedir=/usr/include \ + || return 1 + make || return 1 + make install DESTDIR="$pkgdir" || return 1 +} +md5sums="0182fcac3a2b307113bbec34e5f1c673 bridge-utils-1.4.tar.gz" diff --git a/extra/cdrkit/APKBUILD b/extra/cdrkit/APKBUILD index 332e472318..a5ca8d7710 100644 --- a/extra/cdrkit/APKBUILD +++ b/extra/cdrkit/APKBUILD @@ -1,11 +1,12 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cdrkit -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=1 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" url="http://cdrkit.org/" license="GPL2" -depends="libcap file bzip2" -makedepends="cmake libcap-dev bzip2-dev" +depends="libcap file bzip2 zlib" +makedepends="cmake libcap-dev bzip2-dev zlib-dev" source="http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" @@ -27,4 +28,4 @@ build () ln -s genisoimage.1 mkhybrid.1 || return 1 ln -s icedax.1 cdda2wav.1 || return 1 } -md5sums="97a9ea4e1bf59beb12aca649958d8c6c cdrkit-1.1.8.tar.gz" +md5sums="cbc0647e5d85f0e8fb3a692ba1d42edd cdrkit-1.1.9.tar.gz" diff --git a/extra/cmake/APKBUILD b/extra/cmake/APKBUILD index 5a5c6650ed..56ec018780 100644 --- a/extra/cmake/APKBUILD +++ b/extra/cmake/APKBUILD @@ -1,10 +1,12 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=2.6.2 -pkgrel=0 +pkgver=2.6.3 +pkgrel=1 pkgdesc="CMake is a cross-platform open-source make system" url="http://www.cmake.org" license="CMake" -depends="uclibc gcc g++" +depends="uclibc libgcc g++ ncurses" +makedepends="ncurses-dev" source="http://www.$pkgname.org/files/v2.6/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" @@ -30,4 +32,4 @@ build () make || return 1 make DESTDIR="$pkgdir" install } -md5sums="9e82aa3beb991aa8e5797cf330618d42 cmake-2.6.2.tar.gz" +md5sums="5ba47a94ce276f326abca1fd72a7e7c6 cmake-2.6.3.tar.gz" diff --git a/extra/dnsmasq/APKBUILD b/extra/dnsmasq/APKBUILD index a5ee1c9c93..257583d71a 100644 --- a/extra/dnsmasq/APKBUILD +++ b/extra/dnsmasq/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dnsmasq -pkgver=2.46 +pkgver=2.47 pkgrel=0 pkgdesc="Small forwarding DNS server" url="http://www.thekelleys.org.uk/dnsmasq/" @@ -32,4 +32,6 @@ build() { install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf } -md5sums="79ec740d1a10ee75f13efa4ff36d0250 dnsmasq-2.46.tar.gz" +md5sums="4524081e56d0b935717d493e8e8d3e11 dnsmasq-2.47.tar.gz +fbea3f4a794a6a00cc6fe79c6d44606a dnsmasq.initd +5990c2d2cb92209feacf8f3a5a7d0831 dnsmasq.confd" diff --git a/extra/dovecot/APKBUILD b/extra/dovecot/APKBUILD index 17d9faec34..8b6ba6a7e3 100644 --- a/extra/dovecot/APKBUILD +++ b/extra/dovecot/APKBUILD @@ -1,31 +1,23 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dovecot -pkgver=1.1.11 -pkgrel=1 +pkgver=1.1.13 +pkgrel=0 pkgdesc="IMAP and POP3 server" url="http://www.dovecot.org/" license="LGPL-2.1" depends="uclibc libcap zlib openssl" -makedepends="libcap-dev zlib-dev openssl-dev" +makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev" install="dovecot.pre-install" subpackages="$pkgname-doc $pkgname-dev" source="http://www.dovecot.org/releases/1.1/$pkgname-$pkgver.tar.gz dovecot.initd - dovecot-1.1.11-4736327a8740.patch - dovecot-1.1.11-bdc5391e52df.patch - dovecot-1.1.11-c08c602ca0dc.patch $install " build() { cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do - msg "Applying $i.." - patch -p1 < $i || return 1 - done - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -40,9 +32,6 @@ build() { install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -md5sums="c973eb41aca79fb16630a16f0d84f765 dovecot-1.1.11.tar.gz +md5sums="8f3e10d0161429b15546a8ad6e8b4d25 dovecot-1.1.13.tar.gz 573e14589a6f8424d55753a2794ab99a dovecot.initd -7e1cd399255fbacff197c0ba79b0c2c2 dovecot-1.1.11-4736327a8740.patch -f95cc06111ba3b83399a28cb1459fca0 dovecot-1.1.11-bdc5391e52df.patch -d15abfa0c41426b99423d140d35b2fbd dovecot-1.1.11-c08c602ca0dc.patch f0f8893411f5e482e14f40a81a177b19 dovecot.pre-install" diff --git a/extra/dovecot/dovecot-1.1.11-4736327a8740.patch b/extra/dovecot/dovecot-1.1.11-4736327a8740.patch deleted file mode 100644 index 7f0418e682..0000000000 --- a/extra/dovecot/dovecot-1.1.11-4736327a8740.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# HG changeset patch -# User Timo Sirainen <tss@iki.fi> -# Date 1233868321 18000 -# Node ID 4736327a8740579e7c89a8b386de9af0266b07fa -# Parent 7d175e4ea57d21162abbf43a61c5305cfe1995b3 -Maildir: Fix to earlier >26 keywords handling change. - ---- a/src/lib-storage/index/maildir/maildir-sync-index.c Wed Feb 04 17:44:01 2009 -0500 -+++ b/src/lib-storage/index/maildir/maildir-sync-index.c Thu Feb 05 16:12:01 2009 -0500 -@@ -336,7 +336,7 @@ maildir_sync_mail_keywords(struct maildi - ones. we can get these lists easily by removing common elements - from old and new keywords. */ - new_indexes = array_get_modifiable(&ctx->keywords, &new_count); -- for (i = 0; i < old_count && j < new_count; ) { -+ for (i = j = 0; i < old_count && j < new_count; ) { - diff = (int)old_indexes[i] - (int)new_indexes[j]; - if (diff == 0) { - array_delete(&ctx->keywords, j, 1); - diff --git a/extra/dovecot/dovecot-1.1.11-bdc5391e52df.patch b/extra/dovecot/dovecot-1.1.11-bdc5391e52df.patch deleted file mode 100644 index ac1dc25989..0000000000 --- a/extra/dovecot/dovecot-1.1.11-bdc5391e52df.patch +++ /dev/null @@ -1,49 +0,0 @@ - -# HG changeset patch -# User Timo Sirainen <tss@iki.fi> -# Date 1234226629 18000 -# Node ID bdc5391e52dfe4590e9e291eba2603ed87caef57 -# Parent 4ddf36b9ee8182f10d8d69af6577b677cda282a0 -master: Don't crash if auth process dies too early. - ---- a/src/master/auth-process.c Thu Feb 05 18:29:06 2009 -0500 -+++ b/src/master/auth-process.c Mon Feb 09 19:43:49 2009 -0500 -@@ -353,7 +353,7 @@ static void auth_process_destroy(struct - - if (!p->initialized && io_loop_is_running(ioloop) && !p->external) { - /* log the process exit and kill ourself */ -- child_processes_deinit(); -+ child_processes_flush(); - log_deinit(); - i_fatal("Auth process died too early - shutting down"); - } ---- a/src/master/child-process.c Thu Feb 05 18:29:06 2009 -0500 -+++ b/src/master/child-process.c Mon Feb 09 19:43:49 2009 -0500 -@@ -219,10 +219,15 @@ void child_processes_init(void) - lib_signals_set_handler(SIGCHLD, TRUE, sigchld_handler, NULL); - } - --void child_processes_deinit(void) -+void child_processes_flush(void) - { - /* make sure we log if child processes died unexpectedly */ - sigchld_handler(SIGCHLD, NULL); -+} -+ -+void child_processes_deinit(void) -+{ -+ child_processes_flush(); - lib_signals_unset_handler(SIGCHLD, sigchld_handler, NULL); - hash_destroy(&processes); - } ---- a/src/master/child-process.h Thu Feb 05 18:29:06 2009 -0500 -+++ b/src/master/child-process.h Mon Feb 09 19:43:49 2009 -0500 -@@ -40,6 +40,7 @@ void child_process_set_destroy_callback( - child_process_destroy_callback_t *cb); - - void child_processes_init(void); -+void child_processes_flush(void); - void child_processes_deinit(void); - - #endif - diff --git a/extra/dovecot/dovecot-1.1.11-c08c602ca0dc.patch b/extra/dovecot/dovecot-1.1.11-c08c602ca0dc.patch deleted file mode 100644 index 17ce270515..0000000000 --- a/extra/dovecot/dovecot-1.1.11-c08c602ca0dc.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# HG changeset patch -# User Timo Sirainen <tss@iki.fi> -# Date 1234481874 18000 -# Node ID c08c602ca0dcbc137a4ca965b3722953cabfa4fc -# Parent 4044df5a4d12fef4086d7e604444467eb105f348 -"Maildir filename has wrong W value" error was missing new/cur directory in the middle. - ---- a/src/lib-storage/index/maildir/maildir-mail.c Tue Feb 10 12:19:05 2009 -0500 -+++ b/src/lib-storage/index/maildir/maildir-mail.c Thu Feb 12 18:37:54 2009 -0500 -@@ -485,8 +485,12 @@ static void maildir_mail_set_cache_corru - _mail->uid, &flags); - if (maildir_filename_get_size(fname, MAILDIR_EXTRA_VIRTUAL_SIZE, - &size)) { -- i_error("Maildir filename has wrong W value: %s/%s", -- mbox->path, fname); -+ const char *subdir = -+ (flags & MAILDIR_UIDLIST_REC_FLAG_NEW_DIR) != 0 ? -+ "new" : "cur"; -+ mail_storage_set_critical(_mail->box->storage, -+ "Maildir filename has wrong W value: %s/%s/%s", -+ mbox->path, subdir, fname); - } else if (maildir_uidlist_lookup_ext(mbox->uidlist, _mail->uid, - MAILDIR_UIDLIST_REC_EXT_VSIZE) != NULL) { - maildir_uidlist_set_ext(mbox->uidlist, _mail->uid, - diff --git a/extra/imagemagick/APKBUILD b/extra/imagemagick/APKBUILD index 09fea0b0b5..b42bdbcd20 100644 --- a/extra/imagemagick/APKBUILD +++ b/extra/imagemagick/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.4.9.10 -_pkgver=6.4.9-10 +pkgver=6.5.0.10 +_pkgver=6.5.0-10 pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" @@ -17,18 +17,19 @@ build() { # fix doc dir, Gentoo bug 91911 sed -i -e \ - 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \ - configure || die + 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \ + configure || die ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --without-threads \ + --without-x \ --with-modules make || return 1 make DESTDIR="$pkgdir" install } -md5sums="1306ae34ca40f91963e25e12abe5f5f7 ImageMagick-6.4.9-10.tar.gz" +md5sums="2d9d4440e3ae5c8da4b39402e9ce4d4a ImageMagick-6.5.0-10.tar.gz" diff --git a/extra/libconfig/APKBUILD b/extra/libconfig/APKBUILD index cf1d05a9be..13185722c9 100644 --- a/extra/libconfig/APKBUILD +++ b/extra/libconfig/APKBUILD @@ -1,10 +1,12 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libconfig -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="a simple library for manipulating structured configuration files" url="http://www.hyperrealm.com/libconfig/" license='LGPL' depends="uclibc" +makedepends="g++" source="http://www.hyperrealm.com/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc $pkgname-dev" @@ -15,8 +17,7 @@ build() { --mandir=/usr/share/man \ --disable-cxx make || return 1 - make DESTDIR="$pkgdir/" install + make -j1 DESTDIR="$pkgdir/" install } -md5sums="" #generate with 'abuild checksum' -md5sums="f02bfa27a21b3040089026975b9dc0b8 libconfig-1.3.1.tar.gz" +md5sums="094a82afd382aa2305c6cc3c06025c2d libconfig-1.3.2.tar.gz" diff --git a/extra/libgcrypt/APKBUILD b/extra/libgcrypt/APKBUILD index 53368d1322..c858e68848 100644 --- a/extra/libgcrypt/APKBUILD +++ b/extra/libgcrypt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgcrypt -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=0 pkgdesc="general purpose crypto library based on the code used in GnuPG" url="http://www.gnupg.org" @@ -25,5 +25,5 @@ build () { make -j1 DESTDIR="$pkgdir" install || return 1 rm -f ${pkgdir}/usr/share/info/dir } -md5sums="46e50e811ed51f1e0e8dd677dded967d libgcrypt-1.4.3.tar.bz2 +md5sums="34105aa927e23c217741966496b97e67 libgcrypt-1.4.4.tar.bz2 28513788ba4d556ccd538867dc6205ab nocxx.patch" diff --git a/extra/libgpg-error/APKBUILD b/extra/libgpg-error/APKBUILD index a51b0d3f2c..24cac43606 100644 --- a/extra/libgpg-error/APKBUILD +++ b/extra/libgpg-error/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libgpg-error -pkgver=1.6 +pkgver=1.7 pkgrel=0 pkgdesc="Support library for libgcrypt" url="http://www.gnupg.org" @@ -28,5 +28,5 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -md5sums="f3e9870e213518b407a959f8d29cd554 libgpg-error-1.6.tar.bz2 +md5sums="62c0d09d1e76c5b6da8fff92314c4665 libgpg-error-1.7.tar.bz2 28513788ba4d556ccd538867dc6205ab nocxx.patch" diff --git a/extra/libxml2/APKBUILD b/extra/libxml2/APKBUILD index 1b613c3cf4..a135ade72c 100644 --- a/extra/libxml2/APKBUILD +++ b/extra/libxml2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=libxml2 -pkgver=2.7.2 +pkgver=2.7.3 pkgrel=0 pkgdesc="XML parsing library, version 2" url="http://www.xmlsoft.org/" @@ -9,10 +9,12 @@ license="MIT" depends="zlib" makedepends="zlib-dev" subpackages="$pkgname-doc $pkgname-dev" -source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz + nocxx.patch" build() { cd "$srcdir/$pkgname-$pkgver" + patch configure < ../nocxx.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -23,4 +25,5 @@ build() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="dc43ff7ae6aded45f578c87b7b0c8766 libxml2-2.7.2.tar.gz" +md5sums="8f4fda3969237c2a33bdb1583b5d06b2 libxml2-2.7.3.tar.gz +28513788ba4d556ccd538867dc6205ab nocxx.patch" diff --git a/extra/libxml2/nocxx.patch b/extra/libxml2/nocxx.patch new file mode 100644 index 0000000000..beb1ab9006 --- /dev/null +++ b/extra/libxml2/nocxx.patch @@ -0,0 +1,15 @@ +--- a/configure 2004-12-07 21:34:23.205172545 +0000 ++++ b/configure 2004-12-07 21:37:17.726654782 +0000 +@@ -5148,10 +5148,8 @@ + : + else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++See \`config.log' for more details." >&5;} ++ { echo "C++ sucks, ignoring ..." >&5; }; } + fi + + ac_ext=cc diff --git a/extra/lm_sensors/APKBUILD b/extra/lm_sensors/APKBUILD index bdcb678b8b..8bd7e3b66c 100644 --- a/extra/lm_sensors/APKBUILD +++ b/extra/lm_sensors/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lm_sensors -pkgver=3.0.3 +pkgver=3.1.0 pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." url="http://www.lm-sensors.org/" license="GPL" depends="uclibc sysfsutils rrdtool" -makedepends="perl rrdtool-dev" +makedepends="perl rrdtool-dev bison flex" subpackages="$pkgname-dev $pkgname-doc $pkgname-detect" #install=sensors.install source="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$pkgver.tar.bz2 - lm_sensors-3.0.3-sensors-detect-gentoo.patch + lm_sensors-3.1.0-sensors-detect-alpine.patch fancontrol.initd lm_sensors.initd sensord.confd @@ -55,8 +55,8 @@ detect() { mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/ } -md5sums="e88b236228ac2a50821217015b8fd0fa lm_sensors-3.0.3.tar.bz2 -495d9786dab6a9d0c1e54aa2fb6aeb96 lm_sensors-3.0.3-sensors-detect-gentoo.patch +md5sums="e23130eaa46c66b861729835e08bdccf lm_sensors-3.1.0.tar.bz2 +b6e7de1a1768f7a6ea2e00c226331877 lm_sensors-3.1.0-sensors-detect-alpine.patch 58f4c9193a903711ace7fa0754693bd2 fancontrol.initd 2c7e97203da2c39bc9fbfc2a4849cfd4 lm_sensors.initd 82e075236a61334abb3adf46280380d3 sensord.confd diff --git a/extra/lm_sensors/lm_sensors-3.0.3-sensors-detect-gentoo.patch b/extra/lm_sensors/lm_sensors-3.0.3-sensors-detect-gentoo.patch deleted file mode 100644 index ff353f957b..0000000000 --- a/extra/lm_sensors/lm_sensors-3.0.3-sensors-detect-gentoo.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN lm_sensors-3.0.3.orig/prog/detect/sensors-detect lm_sensors-3.0.3/prog/detect/sensors-detect ---- lm_sensors-3.0.3.orig/prog/detect/sensors-detect 2008-09-19 17:05:28.000000000 +0200 -+++ lm_sensors-3.0.3/prog/detect/sensors-detect 2008-10-27 10:03:39.000000000 +0100 -@@ -27,6 +27,9 @@ - # each be put in a separate file, using modules and packages. That is beyond - # me. - -+# Gentoo specific modifications based on a patch from Rudo Thomas -+# <thomr9am@ss1000.ms.mff.cuni.cz> -+ - require 5.004; - - use strict; -@@ -6076,29 +6079,35 @@ - print MODPROBE_D $configfile; - close(MODPROBE_D); - } else { -+ print "\nIf you want to load the modules at startup, generate a config file\n", -+ "below and make sure lm_sensors gets started at boot time; e.g\n", -+ "\$ rc-update add lm_sensors default\n"; - print "To make the sensors modules behave correctly, add these lines to\n". -- "$modules_conf:\n\n"; -+ "/etc/modules.d/lm_sensors and run modules-update:\n\n"; - print "#----cut here----\n". - $configfile. - "#----cut here----\n\n"; - } - } - -- my $have_sysconfig = -d '/etc/sysconfig'; -- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", -- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), -- ($have_sysconfig ? 'YES/no' : 'yes/NO'); -- $_ = <STDIN>; -- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { -- unless ($have_sysconfig) { -- mkdir('/etc/sysconfig', 0777) -- or die "Sorry, can't create /etc/sysconfig ($!)"; -- } -- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") -- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; -- print SYSCONFIG <<'EOT'; --# /etc/sysconfig/lm_sensors - Defines modules loaded by --# /etc/init.d/lm_sensors -+ my $have_config = -f '/etc/conf.d/lm_sensors'; -+ print "\nDo you want to ".($have_config?"overwrite":"generate"). -+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n", -+ " (".($have_config?"yes/NO":"YES/no")."/s): "; -+ my $reply = <STDIN>; -+ -+ if (($have_config and $reply =~ /^\s*[Yy]/) or -+ (not $have_config and not $reply =~ /^\s*[Nn]/) or -+ $reply =~ /^\s*[Ss]/) { -+ my $filename = "/etc/conf.d/lm_sensors"; -+ if ($reply =~ /^\s*[Ss]/) { -+ print "Specify the file to store the configuration to: "; -+ $filename = <STDIN>; -+ } -+ open(SYSCONFIG, ">".$filename) -+ or die "Sorry, can't create $filename ($!)."; -+ print SYSCONFIG <<'EOT'; -+# /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors - # Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl> - # - # This program is free software; you can redistribute it and/or modify -@@ -6127,12 +6136,21 @@ - # in order as normal variables with the special names: - # MODULE_0, MODULE_1, MODULE_2, etc. - # -+# Please note that the numbers in MODULE_X must start at 0 and increase in -+# steps of 1. Any number that is missing will make the init script skip the -+# rest of the modules. Use MODULE_X_ARGS for arguments. -+# - # List the modules that are to be loaded for your system - # - EOT - print SYSCONFIG -- "# Generated by sensors-detect on " . scalar localtime() . "\n"; -+ "# Generated by sensors-detect on " . scalar localtime() . "\n\n"; - my @modules = grep /^modprobe /, split "\n", $modprobes; -+ print SYSCONFIG -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; - my $i = 0; - my $sysconfig = ""; - foreach (@modules) { -@@ -6142,10 +6160,8 @@ - } - print SYSCONFIG $sysconfig; - close(SYSCONFIG); -+ print "Done.\n"; - -- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". -- "for initialization at boot time.\n" -- unless -f "/etc/init.d/lm_sensors"; - - if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { - system("/sbin/insserv", "/etc/init.d/lm_sensors"); -@@ -6159,15 +6175,6 @@ - "kernel modules.\n\n"; - } - } else { -- print "To load everything that is needed, add this to one of the system\n". -- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n"; -- print "#----cut here----\n". -- $modprobes. -- (-e '/usr/bin/sensors' ? -- "/usr/bin/sensors -s\n" : -- "/usr/local/bin/sensors -s\n") . -- "#----cut here----\n\n"; -- - print "If you have some drivers built into your kernel, the list above will\n". - "contain too many modules. Skip the appropriate ones! You really\n". - "should try these commands right now to make sure everything is\n". diff --git a/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch b/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch new file mode 100644 index 0000000000..9271c6bac2 --- /dev/null +++ b/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch @@ -0,0 +1,39 @@ +diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/detect/sensors-detect +--- lm_sensors-3.1.0.orig/prog/detect/sensors-detect 2009-04-14 07:14:22.000000000 +0000 ++++ lm_sensors-3.1.0/prog/detect/sensors-detect 2009-04-14 07:44:48.000000000 +0000 +@@ -5282,19 +5282,24 @@ + } + } + +- my $have_sysconfig = -d '/etc/sysconfig'; +- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", +- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), +- ($have_sysconfig ? 'YES/no' : 'yes/NO'); ++ my $config = '/etc/conf.d/lm_sensors'; ++ my $have_config = -f $config; ++ printf "Do you want to \%s \%s? (\%s): ", ++ (-e $config ? 'overwrite' : 'generate'), ++ $config, ++ ($have_config ? 'YES/no' : 'yes/NO'); + $_ = <STDIN>; +- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { +- unless ($have_sysconfig) { +- mkdir('/etc/sysconfig', 0777) +- or die "Sorry, can't create /etc/sysconfig ($!)"; +- } +- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") +- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; ++ if (($have_config and not m/^\s*n/i) or m/^\s*y/i) { ++ open(local *SYSCONFIG, ">$config") ++ or die "Sorry, can't create $config ($!)"; + print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; ++ print SYSCONFIG ++ "\n". ++ "# Load modules at startup\n". ++ "LOADMODULES=yes\n\n". ++ "# Initialize sensors at startup\n". ++ "INITSENSORS=yes\n\n"; ++ + print SYSCONFIG <<'EOT'; + # This file is sourced by /etc/init.d/lm_sensors and defines the modules to + # be loaded/unloaded. diff --git a/extra/nfs-utils/APKBUILD b/extra/nfs-utils/APKBUILD index 6bba954de7..112cc58e78 100644 --- a/extra/nfs-utils/APKBUILD +++ b/extra/nfs-utils/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" license="GPL" depends="uclibc portmap libblkid" -makedepends="e2fsprogs-dev" +makedepends="e2fsprogs-dev g++" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 nfs.initd diff --git a/extra/pcre/APKBUILD b/extra/pcre/APKBUILD index ae121618f7..f2749d6a3e 100644 --- a/extra/pcre/APKBUILD +++ b/extra/pcre/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pcre -pkgver=7.8 -pkgrel=1 +pkgver=7.9 +pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" license="BSD" @@ -23,4 +23,4 @@ build() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="141132d6af14dccc7b08fa797e4fd441 pcre-7.8.tar.bz2" +md5sums="b6a9669d1863423f01ea46cdf00f93dc pcre-7.9.tar.bz2" diff --git a/extra/quagga/APKBUILD b/extra/quagga/APKBUILD index cb5653ed7f..130de822b4 100644 --- a/extra/quagga/APKBUILD +++ b/extra/quagga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga pkgver=0.99.11 -pkgrel=8 +pkgrel=9 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" license="GPL-2" @@ -17,6 +17,7 @@ source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz $pkgname-0.99.11-ipv6-only.patch $pkgname-0.99.11-del-routes.patch $pkgname-0.99.11-zombie.patch + $pkgname-0.99.11-fd-leak.patch bgpd.initd ospf6d.initd ospfd.initd @@ -70,6 +71,7 @@ d73000d128eaf20a17ffb15b5ca1805a quagga-0.99.11-ipv6.patch 44c517e988273e0e5076d24f3959a125 quagga-0.99.11-ipv6-only.patch 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch ce345725f2e7240cebe0fd5ac2b2fc48 quagga-0.99.11-zombie.patch +e2391e19b542ec1743776ca9e36ac11a quagga-0.99.11-fd-leak.patch cc109a746273bc0d6aee9d758e7524ab bgpd.initd 44547b687343ebfed7524cebc5626067 ospf6d.initd 89b0cf4e70172bfcd195b2869cae28da ospfd.initd diff --git a/extra/quagga/quagga-0.99.11-fd-leak.patch b/extra/quagga/quagga-0.99.11-fd-leak.patch new file mode 100644 index 0000000000..e558d30a6e --- /dev/null +++ b/extra/quagga/quagga-0.99.11-fd-leak.patch @@ -0,0 +1,19 @@ +--- quagga-0.99.11.DIST/bgpd/bgp_fsm.c 2008-09-09 16:18:57.000000000 -0400 ++++ quagga-0.99.11/bgpd/bgp_fsm.c 2009-04-13 13:09:25.000000000 -0400 +@@ -1013,11 +1013,11 @@ + { + /* Clearing, */ + {bgp_ignore, Clearing}, /* BGP_Start */ +- {bgp_ignore, Clearing}, /* BGP_Stop */ +- {bgp_ignore, Clearing}, /* TCP_connection_open */ +- {bgp_ignore, Clearing}, /* TCP_connection_closed */ +- {bgp_ignore, Clearing}, /* TCP_connection_open_failed */ +- {bgp_ignore, Clearing}, /* TCP_fatal_error */ ++ {bgp_stop, Clearing}, /* BGP_Stop */ ++ {bgp_stop, Clearing}, /* TCP_connection_open */ ++ {bgp_stop, Clearing}, /* TCP_connection_closed */ ++ {bgp_stop, Clearing}, /* TCP_connection_open_failed */ ++ {bgp_stop, Clearing}, /* TCP_fatal_error */ + {bgp_ignore, Clearing}, /* ConnectRetry_timer_expired */ + {bgp_ignore, Clearing}, /* Hold_Timer_expired */ + {bgp_ignore, Clearing}, /* KeepAlive_timer_expired */ diff --git a/extra/samba/APKBUILD b/extra/samba/APKBUILD index 11bc31f351..ecf24f9c7f 100644 --- a/extra/samba/APKBUILD +++ b/extra/samba/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=3.2.8 -pkgrel=1 +pkgver=3.2.10 +pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="http://www.samba.org" license="GPL3" subpackages="$pkgname-dev $pkgname-doc winbind $pkgname-common - $pkgname-initscript" -depends="db popt ncurses uclibc samba-initscript" + $pkgname-initscript tdb" +depends="db popt ncurses uclibc samba-initscript samba-common tdb" makedepends="db-dev popt-dev ncurses-dev" source="http://us1.$pkgname.org/$pkgname/ftp/stable/$pkgname-$pkgver.tar.gz samba.initd @@ -74,7 +74,7 @@ winbind() { common() { pkgdesc="Samba common files for both client an servers" - depends="uclibc popt" + depends="uclibc popt tdb" cd "$pkgdir" _mv_files \ usr/bin/net \ @@ -83,12 +83,20 @@ common() { usr/bin/testparm \ usr/lib/samba/*.dat \ usr/lib/libtalloc* \ - usr/lib/libtdb* \ var/run/samba \ var/cache/samba \ var/log/samba } -md5sums="06efd6e6cc4aac628a1a0b082e4be0f2 samba-3.2.8.tar.gz +tdb() { + pkgdesc="Trivial database" + depends="uclibc" + cd "$pkgdir" + _mv_files \ + usr/lib/libtdb* \ + usr/bin/tdb* +} + +md5sums="7a83207fb05200e9c2114d995f11396e samba-3.2.10.tar.gz 587c1c4824ef5b0ac593fcf8ec8fec78 samba.initd c150433426e18261e6e3eed3930e1a76 samba.confd" diff --git a/extra/sfic/APKBUILD b/extra/sfic/APKBUILD new file mode 100644 index 0000000000..3f781b4dee --- /dev/null +++ b/extra/sfic/APKBUILD @@ -0,0 +1,29 @@ +pkgdesc="Small and Simple File Integrity Checker" +pkgname=sfic +pkgver=0.1.7 +pkgrel=1 +depends=uclibc +license=GPL +makedepends="autoconf automake samba-dev" +depends="tdb uclibc" +arch=i486 +url=http://sfic.sourceforge.net +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-0.1.7-signal.patch" + +subpackages="$pkgname-doc" + +build() { + cd $srcdir/$pkgname-$pkgver + patch -p1 < ../$pkgname-0.1.7-signal.patch || return 1 + + aclocal + autoconf + automake --add-missing || return 1 + ./configure --prefix=/usr + make || return 1 + make install DESTDIR="$pkgdir" +} + +md5sums="6197f7a1e8b0fc4887d4573f67b7bb81 sfic-0.1.7.tar.gz +e0c284f8b4e355b3ea52927fb02e163a sfic-0.1.7-signal.patch" diff --git a/extra/sfic/sfic-0.1.7-signal.patch b/extra/sfic/sfic-0.1.7-signal.patch new file mode 100644 index 0000000000..54538aac1a --- /dev/null +++ b/extra/sfic/sfic-0.1.7-signal.patch @@ -0,0 +1,10 @@ +--- sfic-0.1.7.orig/src/sfic.c 2009-04-13 13:25:49.000000000 +0000 ++++ sfic-0.1.7/src/sfic.c 2009-04-13 13:26:14.000000000 +0000 +@@ -37,6 +37,7 @@ + #include <dirent.h> + #include <stdarg.h> + ++#include <signal.h> + #include <tdb.h> + + #include "heap.h" diff --git a/extra/snort/APKBUILD b/extra/snort/APKBUILD index e51c04e6f9..35b4820651 100644 --- a/extra/snort/APKBUILD +++ b/extra/snort/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> pkgname=snort -pkgver=2.8.3.2 -pkgrel=1 +pkgver=2.8.4 +pkgrel=0 pkgdesc="An open source network intrusion prevention and detection system" url="http://www.snort.org/" license="GPL" @@ -10,6 +10,7 @@ makedepends="pcre-dev libpcap-dev libnet-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev" source="http://www.snort.org/dl/$pkgname-$pkgver.tar.gz + nocxx.patch snort.initd snort.confd $install @@ -17,6 +18,7 @@ source="http://www.snort.org/dl/$pkgname-$pkgver.tar.gz build() { cd "$srcdir/$pkgname-$pkgver" + patch configure < ../nocxx.patch || return 1 ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -31,7 +33,8 @@ build() { install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort } -md5sums="f75547da33446ddb4ca07eefd9ce31dc snort-2.8.3.2.tar.gz +md5sums="193179da8db8aac5ee6b0a751ce7b76d snort-2.8.4.tar.gz +28513788ba4d556ccd538867dc6205ab nocxx.patch b3207150805e7b948d958c6f86e70a5b snort.initd 446f8d2b3435b8a6be738da978670605 snort.confd b9473b349cc9d21faf7b91b591f497d6 snort.pre-install" diff --git a/extra/snort/nocxx.patch b/extra/snort/nocxx.patch new file mode 100644 index 0000000000..beb1ab9006 --- /dev/null +++ b/extra/snort/nocxx.patch @@ -0,0 +1,15 @@ +--- a/configure 2004-12-07 21:34:23.205172545 +0000 ++++ b/configure 2004-12-07 21:37:17.726654782 +0000 +@@ -5148,10 +5148,8 @@ + : + else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++See \`config.log' for more details." >&5;} ++ { echo "C++ sucks, ignoring ..." >&5; }; } + fi + + ac_ext=cc diff --git a/extra/v86d/APKBUILD b/extra/v86d/APKBUILD new file mode 100644 index 0000000000..8bcdcf6181 --- /dev/null +++ b/extra/v86d/APKBUILD @@ -0,0 +1,21 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=v86d +pkgver=0.1.9 +pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" +url="http://dev.gentoo.org/~spock/projects/uvesafb/" +license="GPL2" +depends="uclibc" +makedepends="bash" +source="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$pkgname-$pkgver.tar.bz2 + modprobe.uvesafb" + +build () +{ + cd "$srcdir"/v86d-$pkgver + ./configure --with-x86emu + make || return 1 + make DESTDIR="$pkgdir" install || return 1 + install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb || return 1 +} +md5sums="ebbbc8e7013c9544b6ba6981add43831 v86d-0.1.9.tar.bz2 +2d7cc8dc6a41916a13869212d0191147 modprobe.uvesafb" diff --git a/extra/v86d/modprobe.uvesafb b/extra/v86d/modprobe.uvesafb new file mode 100644 index 0000000000..5e46e10883 --- /dev/null +++ b/extra/v86d/modprobe.uvesafb @@ -0,0 +1,10 @@ +# +# This file sets the parameters for uvesafb module. +# The following format should be used: +# options uvesafb mode=<xres>x<yres>[-<bpp>][@<refresh>] scroll=<ywrap|ypan|redraw> ... +# +# For more details see: +# http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/fb/uvesafb.txt +# + +options uvesafb mode_option=1024x768-32 scroll=ywrap |