diff options
Diffstat (limited to 'core')
29 files changed, 395 insertions, 238 deletions
diff --git a/core/automake/APKBUILD b/core/automake/APKBUILD index 3c7dca7cc2..05fe9dccce 100644 --- a/core/automake/APKBUILD +++ b/core/automake/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake -pkgver=1.10.1 -pkgrel=1 +pkgver=1.10.2 +pkgrel=0 pkgdesc="A GNU tool for automatically creating Makefiles" arch=i486 license=GPL @@ -18,4 +18,4 @@ build() { make DESTDIR=$pkgdir install } -md5sums="a0acfd1b167ba55a256f0c1af2983975 automake-1.10.1.tar.gz" +md5sums="ede3e08c696861a01f4d2c6a2e822053 automake-1.10.2.tar.gz" diff --git a/core/bison/APKBUILD b/core/bison/APKBUILD index d9aa4c3a7d..c0de867ead 100644 --- a/core/bison/APKBUILD +++ b/core/bison/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bison -pkgver=2.3 +pkgver=2.4.1 pkgrel=5 pkgdesc="The GNU general-purpose parser generator" license="GPL" @@ -19,4 +19,4 @@ build() { make DESTDIR="$pkgdir" install } -md5sums='22327efdd5080e2b1acb6e560a04b43a bison-2.3.tar.gz' +md5sums="c58aa1da418dc9704070872489e89bf5 bison-2.4.1.tar.gz" diff --git a/core/e2fsprogs/APKBUILD b/core/e2fsprogs/APKBUILD index 5330411aa0..11cae6403d 100644 --- a/core/e2fsprogs/APKBUILD +++ b/core/e2fsprogs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=e2fsprogs -pkgver=1.41.3 -pkgrel=4 +pkgver=1.41.4 +pkgrel=0 pkgdesc="Standard Ext2/3/4 filesystem utilities" url="http://e2fsprogs.sourceforge.net" license="GPL LGPL MIT" @@ -40,4 +40,4 @@ libblkid() { mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ } -md5sums="b21d26fc46c584021dc9c444933ee1c2 e2fsprogs-1.41.3.tar.gz" +md5sums="59033388df36987d2b9c9bbf7e19bd57 e2fsprogs-1.41.4.tar.gz" diff --git a/core/fakeroot/APKBUILD b/core/fakeroot/APKBUILD index 141a207aec..ab5b05f6f2 100644 --- a/core/fakeroot/APKBUILD +++ b/core/fakeroot/APKBUILD @@ -1,6 +1,7 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot -pkgver=1.12.1 -pkgrel=2 +pkgver=1.12.2 +pkgrel=0 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" license='GPL' url="http://packages.debian.org/fakeroot" @@ -17,5 +18,5 @@ build() { make DESTDIR=$startdir/pkg install } -md5sums="87970d6784f536cde84f9bcbaaa52720 fakeroot_1.12.1.tar.gz +md5sums="1eb7d972a19159035892e7d132602726 fakeroot_1.12.2.tar.gz ea7b7e3065090d72804cdf4719dd5832 busybox-compat.patch" diff --git a/core/file/APKBUILD b/core/file/APKBUILD index a7fd0ffb28..50b9b8e6c4 100644 --- a/core/file/APKBUILD +++ b/core/file/APKBUILD @@ -1,19 +1,22 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=file -pkgver=4.26 -pkgrel=1 +pkgver=5.00 +pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" license="custom" depends="uclibc zlib" -source="ftp://ftp.astron.com/pub/file/file-4.26.tar.gz" +source="ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz + nocxx.patch" subpackages="$pkgname-dev $pkgname-doc" build () { - cd ${srcdir}/$pkgname-$pkgver; - ./configure --prefix=/usr --datadir=/usr/share/misc; - make || return 1; - make DESTDIR=${pkgdir} install; + cd "$srcdir"/$pkgname-$pkgver + patch configure < ../nocxx.patch || return 1 + ./configure --prefix=/usr --datadir=/usr/share/misc + make || return 1 + make DESTDIR="$pkgdir" install } -md5sums="74cd5466416136da30a4e69f74dbc7a0 file-4.26.tar.gz" +md5sums="fd0b4ce55a756151629e06eaa3411e0c file-5.00.tar.gz +28513788ba4d556ccd538867dc6205ab nocxx.patch" diff --git a/core/file/nocxx.patch b/core/file/nocxx.patch new file mode 100644 index 0000000000..beb1ab9006 --- /dev/null +++ b/core/file/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/core/git/APKBUILD b/core/git/APKBUILD index 5b31dbec6a..f72cce26fa 100644 --- a/core/git/APKBUILD +++ b/core/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.6.2.1 +pkgver=1.6.2.3 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -26,6 +26,6 @@ build () { make prefix=/usr DESTDIR="$pkgdir" $makeopts install } -md5sums="e96481361887f63227fdaa5ccdbb03b7 git-1.6.2.1.tar.bz2 +md5sums="7213fa232e0f83fc2971ded6e528ae18 git-1.6.2.3.tar.bz2 89fe31c2317c285ed18527a700da7844 git-1.6.0.4-noperl.patch 04e1bdf76a0bac568f8488daad07dce7 bb-tar.patch" diff --git a/core/iptables/APKBUILD b/core/iptables/APKBUILD index 0d409bda66..b673ec0060 100644 --- a/core/iptables/APKBUILD +++ b/core/iptables/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables -pkgver=1.4.3.1 +pkgver=1.4.3.2 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" license=GPL-2 source="http://iptables.org/projects/iptables/files/$pkgname-$pkgver.tar.bz2 - iptables-1.4.2-no-ldconfig.patch iptables-1.4.2-include-in.patch + nocxx.patch iptables.initd iptables.confd " @@ -61,8 +61,8 @@ ip6tables() { "$subpkgdir"/etc/init.d/ip6tables } -md5sums="9c67f796f69e1e016cc19e2c19357711 iptables-1.4.3.1.tar.bz2 -7b9c52caf34663186c32ea44b80c9a03 iptables-1.4.2-no-ldconfig.patch +md5sums="545698693b636cfc844aafc6729fd48a iptables-1.4.3.2.tar.bz2 ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch +28513788ba4d556ccd538867dc6205ab nocxx.patch 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd 956ebf5ab69e5a1e1d3983541eab643b iptables.confd" diff --git a/core/iptables/iptables-1.4.2-no-ldconfig.patch b/core/iptables/iptables-1.4.2-no-ldconfig.patch deleted file mode 100644 index 943ff4aef7..0000000000 --- a/core/iptables/iptables-1.4.2-no-ldconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ -avoid pointless overhead for DESTDIR builds - -http://bugzilla.netfilter.org/show_bug.cgi?id=560 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -1530,7 +1530,7 @@ - # ldconfig may fail when we are not root (as is the case in build systems) - # so add appropriate protection that it does not let `make` fail. - install-exec-hook: -- -/sbin/ldconfig || :; -+ -[ -z "$(DESTDIR)" ] && /sbin/ldconfig - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/core/iptables/nocxx.patch b/core/iptables/nocxx.patch new file mode 100644 index 0000000000..beb1ab9006 --- /dev/null +++ b/core/iptables/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/core/libpcap/APKBUILD b/core/libpcap/APKBUILD index 3db64d26cf..ebe0996161 100644 --- a/core/libpcap/APKBUILD +++ b/core/libpcap/APKBUILD @@ -1,19 +1,24 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libpcap pkgver=1.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="A system-independent interface for user-level packet capture" url="http://www.tcpdump.org/" license="BSD" depends="uclibc" makedepends="bison flex" source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz - $pkgname-1.0.0-LDFLAGS.patch" + $pkgname-1.0.0-LDFLAGS.patch + $pkgname-any.patch" subpackages="$pkgname-doc $pkgname-dev" build () { cd ${startdir}/src/${pkgname}-${pkgver} - patch -Np1 -i ${startdir}/libpcap-1.0.0-LDFLAGS.patch || return 1 + for i in ../*.patch; do + msg "Applying $i..." + patch -p1 -i $i || return 1 + done ./configure --prefix=/usr --enable-ipv6 @@ -26,4 +31,5 @@ build () # ln -s ../pcap-bpf.h bpf.h } md5sums="9ad1358c5dec48456405eac197a46d3d libpcap-1.0.0.tar.gz -2bf7e986980c6e5d99758ba55b48d706 libpcap-1.0.0-LDFLAGS.patch" +2bf7e986980c6e5d99758ba55b48d706 libpcap-1.0.0-LDFLAGS.patch +1e6b01c4f283b497e81e137c3f35e744 libpcap-any.patch" diff --git a/core/libpcap/libpcap-any.patch b/core/libpcap/libpcap-any.patch new file mode 100644 index 0000000000..7754513b88 --- /dev/null +++ b/core/libpcap/libpcap-any.patch @@ -0,0 +1,157 @@ +commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808 +Author: guy <guy> +Date: Wed Nov 19 08:20:39 2008 +0000 + + Fix the handling of the "any" device, including making it reject + attempts to open it in monitor mode. + +diff --git a/pcap-linux.c b/pcap-linux.c +index 2a92d30..b18c4d2 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -297,6 +297,12 @@ pcap_create(const char *device, char *ebuf) + { + pcap_t *handle; + ++ /* ++ * A null device name is equivalent to the "any" device. ++ */ ++ if (device == NULL) ++ device = "any"; ++ + #ifdef HAVE_DAG_API + if (strstr(device, "dag")) { + return dag_create(device, ebuf); +@@ -338,10 +344,9 @@ pcap_can_set_rfmon_linux(pcap_t *p) + struct iwreq ireq; + #endif + +- if (p->opt.source == NULL) { ++ if (strcmp(p->opt.source, "any") == 0) { + /* +- * This is equivalent to the "any" device, and we don't +- * support monitor mode on it. ++ * Monitor mode makes no sense on the "any" device. + */ + return 0; + } +@@ -518,12 +523,11 @@ pcap_activate_linux(pcap_t *handle) + handle->stats_op = pcap_stats_linux; + + /* +- * NULL and "any" are special devices which give us the hint to +- * monitor all devices. ++ * The "any" device is a special device which causes us not ++ * to bind to a particular device and thus to look at all ++ * devices. + */ +- if (!device || strcmp(device, "any") == 0) { +- device = NULL; +- handle->md.device = strdup("any"); ++ if (strcmp(device, "any") == 0) { + if (handle->opt.promisc) { + handle->opt.promisc = 0; + /* Just a warning. */ +@@ -531,10 +535,9 @@ pcap_activate_linux(pcap_t *handle) + "Promiscuous mode not supported on the \"any\" device"); + status = PCAP_WARNING_PROMISC_NOTSUP; + } ++ } + +- } else +- handle->md.device = strdup(device); +- ++ handle->md.device = strdup(device); + if (handle->md.device == NULL) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s", + pcap_strerror(errno) ); +@@ -1657,19 +1660,21 @@ static int + activate_new(pcap_t *handle) + { + #ifdef HAVE_PF_PACKET_SOCKETS ++ const char *device = handle->opt.source; ++ int is_any_device = (strcmp(device, "any") == 0); + int sock_fd = -1, arptype, val; + int err = 0; + struct packet_mreq mr; +- const char* device = handle->opt.source; + + /* +- * Open a socket with protocol family packet. If a device is +- * given we try to open it in raw mode otherwise we use +- * the cooked interface. ++ * Open a socket with protocol family packet. If the ++ * "any" device was specified, we open a SOCK_DGRAM ++ * socket for the cooked interface, otherwise we first ++ * try a SOCK_RAW socket for the raw interface. + */ +- sock_fd = device ? +- socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) +- : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); ++ sock_fd = is_any_device ? ++ socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) : ++ socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + + if (sock_fd == -1) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", +@@ -1704,7 +1709,7 @@ activate_new(pcap_t *handle) + * to cooked mode if we have an unknown interface type + * or a type we know doesn't work well in raw mode. + */ +- if (device) { ++ if (!is_any_device) { + /* Assume for now we don't need cooked mode. */ + handle->md.cooked = 0; + +@@ -1819,15 +1824,23 @@ activate_new(pcap_t *handle) + } + } else { + /* +- * This is cooked mode. ++ * The "any" device. ++ */ ++ if (handle->opt.rfmon) { ++ /* ++ * It doesn't support monitor mode. ++ */ ++ return PCAP_ERROR_RFMON_NOTSUP; ++ } ++ ++ /* ++ * It uses cooked mode. + */ + handle->md.cooked = 1; + handle->linktype = DLT_LINUX_SLL; + + /* + * We're not bound to a device. +- * XXX - true? Or true only if we're using +- * the "any" device? + * For now, we're using this as an indication + * that we can't transmit; stop doing that only + * if we figure out how to transmit in cooked +@@ -1852,10 +1865,13 @@ activate_new(pcap_t *handle) + + /* + * Hmm, how can we set promiscuous mode on all interfaces? +- * I am not sure if that is possible at all. ++ * I am not sure if that is possible at all. For now, we ++ * silently ignore attempts to turn promiscuous mode on ++ * for the "any" device (so you don't have to explicitly ++ * disable it in programs such as tcpdump). + */ + +- if (device && handle->opt.promisc) { ++ if (!is_any_device && handle->opt.promisc) { + memset(&mr, 0, sizeof(mr)); + mr.mr_ifindex = handle->md.ifindex; + mr.mr_type = PACKET_MR_PROMISC; +@@ -3118,7 +3134,7 @@ activate_old(pcap_t *handle) + + /* Bind to the given device */ + +- if (!device) { ++ if (strcmp(device, "any") == 0) { + strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems", + PCAP_ERRBUF_SIZE); + return PCAP_ERROR; diff --git a/core/linux-grsec/APKBUILD b/core/linux-grsec/APKBUILD index 5c690da865..1c886e60e1 100644 --- a/core/linux-grsec/APKBUILD +++ b/core/linux-grsec/APKBUILD @@ -1,7 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=linux-grsec +_flavor=grsec +pkgname=linux-$_flavor pkgver=2.6.28.9 -pkgrel=0 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net arch=i486 @@ -14,21 +15,24 @@ build() { mkdir -p "$srcdir/$pkgname" cd "$srcdir/$pkgname" cp ../kernelconfig .config - make -C /usr/src/linux-$pkgver-grsec "O=$PWD" silentoldconfig - make || return 1 + make -C /usr/src/linux-$pkgver-grsec "O=$PWD" HOSTCC="$CC" \ + silentoldconfig + make CC="$CC" || return 1 mkdir -p $pkgdir/boot $pkgdir/lib/modules make modules_install install \ INSTALL_MOD_PATH=$pkgdir \ INSTALL_PATH=$pkgdir/boot cd "$pkgdir"/boot - mv vmlinuz ${pkgname#linux-} - mv System.map System-${pkgname#linux-}.map + mv vmlinuz $_flavor } dev() { + install -Dm644 "$srcdir"/$pkgname/Module.symvers \ + "$subpkgdir"/boot/Module.symvers-$_flavor install -Dm644 "$srcdir/kernelconfig" \ - "$subpkgdir"/usr/share/$pkgname/config + "$subpkgdir"/boot/config-$_flavor + mv "$pkgdir"/boot/System.map "$subpkgdir"/boot/System.map-$_flavor } -md5sums="b44152b7ca7199c3d6ab499a61f06fdd kernelconfig" +md5sums="126695c2a7fd5e91ca7e7fe1d7acad59 kernelconfig" diff --git a/core/linux-grsec/kernelconfig b/core/linux-grsec/kernelconfig index c45b3e1864..6e38b3d80f 100644 --- a/core/linux-grsec/kernelconfig +++ b/core/linux-grsec/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.28.7 -# Thu Mar 19 12:44:45 2009 +# Linux kernel version: 2.6.28.9 +# Wed Apr 8 13:33:07 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -86,6 +86,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -95,10 +96,8 @@ CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y -# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -108,6 +107,7 @@ CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -172,17 +172,19 @@ CONFIG_X86_PC=y # CONFIG_X86_RDC321X is not set CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_SAVE_RESTORE=y CONFIG_VMI=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_MEMTEST is not set # CONFIG_M386 is not set -CONFIG_M486=y +# CONFIG_M486 is not set # CONFIG_M586 is not set -# CONFIG_M586TSC is not set +CONFIG_M586TSC=y # CONFIG_M586MMX is not set # CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set @@ -217,6 +219,8 @@ CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -238,7 +242,7 @@ CONFIG_PREEMPT_NONE=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_MCE is not set -# CONFIG_VM86 is not set +CONFIG_VM86=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -249,8 +253,8 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set @@ -258,7 +262,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -272,7 +277,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y -# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -1202,6 +1207,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y @@ -1580,6 +1586,7 @@ CONFIG_IEEE1394_DV1394=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -1727,7 +1734,6 @@ CONFIG_E1000E=m CONFIG_IP1000=m CONFIG_IGB=m CONFIG_IGB_LRO=y -CONFIG_IGB_DCA=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1749,11 +1755,9 @@ CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m CONFIG_ENIC=m CONFIG_IXGBE=m -CONFIG_IXGBE_DCA=y CONFIG_IXGB=m CONFIG_S2IO=m CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_MLX4_EN=m @@ -1972,6 +1976,7 @@ CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y +CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_FDDI=y CONFIG_DEFXX=m # CONFIG_DEFXX_MMIO is not set @@ -2062,6 +2067,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m CONFIG_INPUT_EVBUG=m +CONFIG_XEN_KBDDEV_FRONTEND=m # # Input Device Drivers @@ -2245,7 +2251,9 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -3051,7 +3059,7 @@ CONFIG_FB_PM2_FIFO_DISCONNECT=y CONFIG_FB_CYBER2000=m CONFIG_FB_ARC=m CONFIG_FB_VGA16=m -# CONFIG_FB_UVESA is not set +CONFIG_FB_UVESA=m CONFIG_FB_N411=m CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set @@ -3118,6 +3126,7 @@ CONFIG_FB_GEODE_GX=m CONFIG_FB_GEODE_GX1=m CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m # CONFIG_FB_MB862XX_PCI_GDC is not set @@ -3704,20 +3713,6 @@ CONFIG_RTC_DRV_WM8350=m # # on-CPU RTC drivers # -CONFIG_DMADEVICES=y - -# -# DMA Devices -# -CONFIG_INTEL_IOATDMA=m -CONFIG_DMA_ENGINE=y - -# -# DMA Clients -# -CONFIG_NET_DMA=y -CONFIG_DMATEST=m -CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -3729,6 +3724,8 @@ CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SMX=m CONFIG_UIO_SERCOS3=m +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y # CONFIG_STAGING is not set # @@ -3897,7 +3894,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_SUNRPC_REGISTER_V4=y +# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_SMB_FS=m @@ -4133,6 +4130,7 @@ CONFIG_PAX_HAVE_ACL_FLAGS=y # Non-executable pages # CONFIG_PAX_NOEXEC=y +# CONFIG_PAX_PAGEEXEC is not set CONFIG_PAX_SEGMEXEC=y # CONFIG_PAX_EMUTRAMP is not set CONFIG_PAX_MPROTECT=y @@ -4142,6 +4140,7 @@ CONFIG_PAX_NOELFRELOCS=y # Address Space Layout Randomization # CONFIG_PAX_ASLR=y +# CONFIG_PAX_RANDKSTACK is not set CONFIG_PAX_RANDUSTACK=y CONFIG_PAX_RANDMMAP=y @@ -4273,9 +4272,8 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m -CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m diff --git a/core/lvm2/APKBUILD b/core/lvm2/APKBUILD index 76bb450688..07df9f6005 100644 --- a/core/lvm2/APKBUILD +++ b/core/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.44 -pkgrel=1 +pkgver=2.02.45 +pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="http://sourceware.org/lvm2/" license="GPL" @@ -31,5 +31,5 @@ build () { install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm } -md5sums="4ed7b99903a6fc5165b7b0b8def42486 LVM2.2.02.44.tgz +md5sums="440daa01b8f2ec4fe97b1cc621108220 LVM2.2.02.45.tgz e60d88f78eedb9c1252deb5b9b9b978b lvm.initd" diff --git a/core/m4/APKBUILD b/core/m4/APKBUILD index b9b208ef12..65a998eafb 100644 --- a/core/m4/APKBUILD +++ b/core/m4/APKBUILD @@ -1,5 +1,6 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=m4 -pkgver=1.4.12 +pkgver=1.4.13 pkgrel=0 pkgdesc="GNU macro processor" arch=i486 @@ -17,4 +18,4 @@ build() { make install DESTDIR="$pkgdir" } -md5sums="0499a958a561781b125c740f18061ea8 m4-1.4.12.tar.gz" +md5sums="e9e36108b5f9855a82ca4a07ebc0fd2e m4-1.4.13.tar.gz" diff --git a/core/mdadm/APKBUILD b/core/mdadm/APKBUILD index 9ef956269e..bc98d6e33e 100644 --- a/core/mdadm/APKBUILD +++ b/core/mdadm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Carlo Landmeter <clandmeter at gmail> pkgname=mdadm -pkgver=2.6.8 -pkgrel=1 +pkgver=2.6.9 +pkgrel=0 pkgdesc="a tool for managing Linux Software RAID arrays" url="http://neil.brown.name/blog/mdadm" license="GPL-2" @@ -19,7 +19,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" make || return 1 - make INSTALL=/bin/install DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m755 -D "$srcdir"/$pkgname-raid.initd "$pkgdir"/etc/init.d/$pkgname-raid @@ -27,7 +27,7 @@ build() { install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf } -md5sums="bcc30968711a078387fba44867eb7a23 mdadm-2.6.8.tar.gz +md5sums="beaa0f066288441d9b3ad1ef67fa0237 mdadm-2.6.9.tar.gz 96b323ba5b778aeb905c119b9547b2a5 mdadm.initd 16d2b8eb2e17184357db503470fdd8eb mdadm.confd cf60ee08fc4fbed0450c5a2d4efc4214 mdadm-raid.initd" diff --git a/core/module-init-tools/APKBUILD b/core/module-init-tools/APKBUILD index d65074fbd3..363b7dccc9 100644 --- a/core/module-init-tools/APKBUILD +++ b/core/module-init-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanel Copa <ncopa@alpinelinux.org> pkgname=module-init-tools -pkgver=3.4 -pkgrel=1 +pkgver=3.5 +pkgrel=0 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://www.kernel.org" license='GPL' @@ -15,10 +15,10 @@ build() { # sed -i 's|/usr/bin/install|/bin/install|g' install-with-care ./configure --prefix=/usr --exec-prefix=/ make DOCBOOKTOMAN=: || return 1 - make DESTDIR="$pkgdir" INSTALL=install install || return 1 + make -j1 DESTDIR="$pkgdir" INSTALL=install install || return 1 # remove empty manpages. rm -r "$pkgdir/usr" } -md5sums="db6ac059e80e8dd4389dbe81ee61f3c6 module-init-tools-3.4.tar.bz2" +md5sums="2b47686247fc9a99bfdb9dd1d1d80e6f module-init-tools-3.5.tar.bz2" diff --git a/core/mtools/APKBUILD b/core/mtools/APKBUILD index bfe3ac9166..0b84bdd616 100644 --- a/core/mtools/APKBUILD +++ b/core/mtools/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mtools -pkgver=3.9.11 +pkgver=4.0.10 pkgrel=0 pkgdesc="A collection of utilities to access MS-DOS disks from Unix without mounting them" -url="http://mtools.linux.lu/" +url="http://www.gnu.org/software/mtools/" license="GPL" depends="uclibc" makedepends="texinfo" -source="http://$pkgname.linux.lu/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2" subpackages="$pkgname-doc" build () { @@ -20,4 +20,4 @@ build () { make -j1 install DESTDIR="$pkgdir" } -md5sums="3c0ae05b0d98a5d3bd06d3d72fcaf80d mtools-3.9.11.tar.gz" +md5sums="750c2beba968a5d46dbaae24551a82b9 mtools-4.0.10.tar.bz2" diff --git a/core/openssl/APKBUILD b/core/openssl/APKBUILD index 67bce486fe..7f2dc27650 100644 --- a/core/openssl/APKBUILD +++ b/core/openssl/APKBUILD @@ -1,5 +1,6 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssl -pkgver=0.9.8j +pkgver=0.9.8k pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url=http://openssl.org @@ -12,19 +13,23 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz http://www.linuxfromscratch.org/patches/blfs/svn/openssl-0.9.8g-fix_manpages-1.patch openssl-bb-basename.patch + openssl-0.9.8k-quote-cc.patch " build() { - cd $startdir/src/$pkgname-$pkgver + cd "$startdir"/src/$pkgname-$pkgver + for i in ../*.patch; do + msg "Applying $i..." + patch -p1 < $i || return 1 + done - patch -p1 -i ../openssl-0.9.8g-fix_manpages-1.patch || return 1 - patch -p1 -i ../openssl-bb-basename.patch || return 1 ./config --prefix=/usr --openssldir=/etc/ssl shared make -j1 || return 1 make INSTALL_PREFIX=$startdir/pkg MANDIR=/usr/share/man install } -md5sums="a5cb5f6c3d11affb387ecf7a997cac0c openssl-0.9.8j.tar.gz +md5sums="e555c6d58d276aec7fdc53363e338ab3 openssl-0.9.8k.tar.gz 04a6a88c2ee4badd4f8649792b73eaf3 openssl-0.9.8g-fix_manpages-1.patch -c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch" +c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch +c838eb8488896cfeb7de957a0cbe04ae openssl-0.9.8k-quote-cc.patch" diff --git a/core/openssl/openssl-0.9.8k-quote-cc.patch b/core/openssl/openssl-0.9.8k-quote-cc.patch new file mode 100644 index 0000000000..5a61662886 --- /dev/null +++ b/core/openssl/openssl-0.9.8k-quote-cc.patch @@ -0,0 +1,72 @@ +--- openssl-0.9.8k/Makefile.orig 2009-04-07 12:28:31.000000000 +0000 ++++ openssl-0.9.8k/Makefile 2009-04-07 12:30:13.000000000 +0000 +@@ -359,7 +359,7 @@ + $(AR) libcrypto.a fips/fipscanister.o ; \ + else \ + if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ +- FIPSLD_CC=$(CC); CC=fips/fipsld; \ ++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ + export CC FIPSLD_CC; \ + fi; \ + $(MAKE) -e SHLIBDIRS='crypto' build-shared; \ +@@ -382,9 +382,9 @@ + fips/fipscanister.o: build_fips + libfips$(SHLIB_EXT): fips/fipscanister.o + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \ + $(MAKE) -f Makefile.shared -e $(BUILDENV) \ +- CC=$${CC} LIBNAME=fips THIS=$@ \ ++ CC="$${CC}" LIBNAME=fips THIS=$@ \ + LIBEXTRAS=fips/fipscanister.o \ + LIBDEPS="$(EX_LIBS)" \ + LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \ +--- openssl-0.9.8k/apps/Makefile.orig 2009-04-07 12:35:30.000000000 +0000 ++++ openssl-0.9.8k/apps/Makefile 2009-04-07 12:56:53.000000000 +0000 +@@ -153,12 +153,12 @@ + shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ + shlib_target="$(SHLIB_TARGET)"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \ + [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ ++ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + -(cd ..; \ +--- openssl-0.9.8k/test/Makefile.orig 2009-04-07 13:26:06.000000000 +0000 ++++ openssl-0.9.8k/test/Makefile 2009-04-07 13:26:38.000000000 +0000 +@@ -402,13 +402,13 @@ + if [ "$(FIPSCANLIB)" = "libfips" ]; then \ + LIBRARIES="-L$(TOP) -lfips"; \ + elif [ -n "$(FIPSCANLIB)" ]; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ + else \ + LIBRARIES="$(LIBCRYPTO)"; \ + fi; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + +@@ -417,11 +417,11 @@ + fi; \ + LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ + if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ +- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ ++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ + fi; \ + [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ + $(MAKE) -f $(TOP)/Makefile.shared -e \ +- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ ++ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ + link_app.$${shlib_target} + diff --git a/core/parted/APKBUILD b/core/parted/APKBUILD index dd1f2c967b..6ee3f3f042 100644 --- a/core/parted/APKBUILD +++ b/core/parted/APKBUILD @@ -7,7 +7,7 @@ url="http://www.gnu.org/software/parted/parted.html" license="GPL3" subpackages="$pkgname-dev $pkgname-doc" depends="libuuid uclibc readline ncurses" -makedepends="pkgconfig e2fsprogs-dev uclibc readline-dev ncurses-dev" +makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev" source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz nocxx.patch" diff --git a/core/sfic/APKBUILD b/core/sfic/APKBUILD deleted file mode 100644 index 75342aadd2..0000000000 --- a/core/sfic/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -pkgdesc="Small and Simple File Integrity Checker" -pkgname=sfic -pkgver=0.1.7 -pkgrel=0 -depends=uclibc -license=GPL -makedepends="autoconf automake tdb-dev" -depends="tdb uclibc" -arch=i486 -url=http://sfic.sourceforge.net -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - -subpackages="$pkgname-doc" - -build() { - cd $srcdir/$pkgname-$pkgver - 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" diff --git a/core/sudo/APKBUILD b/core/sudo/APKBUILD index 6baa11b610..61d84eae4c 100644 --- a/core/sudo/APKBUILD +++ b/core/sudo/APKBUILD @@ -1,18 +1,17 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sudo -pkgver=1.6.9_p17 -_myver=1.6.9p17 -pkgrel=1 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Give certain users the ability to run some commands as root" url="http://www.sudo.ws/sudo/" license='custom ISC' depends='uclibc' backup='etc/sudoers' -source="ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_myver.tar.gz" +source="ftp://ftp.sudo.ws/pub/sudo/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc" build() { - cd "$srcdir/$pkgname-$_myver" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --with-env-editor \ @@ -21,7 +20,7 @@ build() { --without-offensive-insults \ || return 1 make || return 1 - make DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install || return 1 } -md5sums="60daf18f28e2c1eb7641c4408e244110 sudo-1.6.9p17.tar.gz" +md5sums="5fd96bba35fe29b464f7aa6ad255f0a6 sudo-1.7.0.tar.gz" diff --git a/core/syslinux/APKBUILD b/core/syslinux/APKBUILD index 4feb664b4d..ba2a6c4325 100644 --- a/core/syslinux/APKBUILD +++ b/core/syslinux/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux -pkgver=3.72 +pkgver=3.74 pkgrel=0 pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." url="http://syslinux.org" @@ -21,5 +21,5 @@ build () make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install } -md5sums="9858c801ecd36265f4374996324f01a0 syslinux-3.72.tar.bz2 +md5sums="2154fee98c34bc1bd5a14f5d6f4e1f77 syslinux-3.74.tar.bz2 c08398d165d29e48711e55058e2897de syslinux-3.72-nopie.patch" diff --git a/core/tdb/APKBUILD b/core/tdb/APKBUILD deleted file mode 100644 index 4e9c2b8360..0000000000 --- a/core/tdb/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -pkgdesc="A Trivial Database" -pkgname=tdb -pkgver=1.0.6 -pkgrel=1 -url="http://sourceforge.net/projects/tdb" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-1.0.6-gcc3.patch - $pkgname-1.0.6-no-gdbm.patch" -license="GPL-2" - -subpackages="$pkgname-dev $pkgname-doc" -depends="uclibc" - -build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/$pkgname-1.0.6-gcc3.patch || return 1 - patch -p0 -i $srcdir/$pkgname-1.0.6-no-gdbm.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make install DESTDIR=$pkgdir -} -md5sums="6b643fdeb48304010dcd5f675e458b58 tdb-1.0.6.tar.gz -3dbbde1145303ad43730f2bc1bb3b82b tdb-1.0.6-gcc3.patch -8a4247a9e3c5af757cfa1d5c20733642 tdb-1.0.6-no-gdbm.patch" diff --git a/core/tdb/tdb-1.0.6-gcc3.patch b/core/tdb/tdb-1.0.6-gcc3.patch deleted file mode 100644 index a17afbac95..0000000000 --- a/core/tdb/tdb-1.0.6-gcc3.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- tdb-1.0.6/tdbtool.c.old 2001-12-10 22:45:47.000000000 -0500 -+++ tdb-1.0.6/tdbtool.c 2003-10-02 22:41:51.000000000 -0400 -@@ -169,22 +169,22 @@ - - static void help(void) - { -- printf(" --tdbtool: -- create dbname : create a database -- open dbname : open an existing database -- erase : erase the database -- dump dumpname : dump the database as strings -- insert key data : insert a record -- store key data : store a record (replace) -- show key : show a record by key -- delete key : delete a record by key -- list : print the database hash table and freelist -- free : print the database freelist -- 1 | first : print the first record -- n | next : print the next record -- q | quit : terminate -- \\n : repeat 'next' command -+ printf("\n\ -+tdbtool:\n\ -+ create dbname : create a database\n\ -+ open dbname : open an existing database\n\ -+ erase : erase the database\n\ -+ dump dumpname : dump the database as strings\n\ -+ insert key data : insert a record\n\ -+ store key data : store a record (replace)\n\ -+ show key : show a record by key\n\ -+ delete key : delete a record by key\n\ -+ list : print the database hash table and freelist\n\ -+ free : print the database freelist\n\ -+ 1 | first : print the first record\n\ -+ n | next : print the next record\n\ -+ q | quit : terminate\n\ -+ \\n : repeat 'next' command\n\ - "); - } - diff --git a/core/tdb/tdb-1.0.6-no-gdbm.patch b/core/tdb/tdb-1.0.6-no-gdbm.patch deleted file mode 100644 index 0f47030767..0000000000 --- a/core/tdb/tdb-1.0.6-no-gdbm.patch +++ /dev/null @@ -1,16 +0,0 @@ -gdbm is only used in tdbspeed and tdbtest which never get -installed, so lets go ahead and force disable gdbm "support" - -http://bugs.gentoo.org/113824 - ---- Makefile.in -+++ Makefile.in -@@ -80,7 +80,7 @@ - @BUILD_TDBTORTURE_TRUE@TDBTORTURE = tdbtorture - @BUILD_TDBTORTURE_FALSE@TDBTORTURE = - --noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE) -+noinst_PROGRAMS = tdbiterate $(TDBTORTURE) - bin_PROGRAMS = tdbtool tdbdump - - lib_LTLIBRARIES = libtdb.la diff --git a/core/xtables-addons/APKBUILD b/core/xtables-addons/APKBUILD index 172b11c226..88123ecf85 100644 --- a/core/xtables-addons/APKBUILD +++ b/core/xtables-addons/APKBUILD @@ -1,29 +1,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=xtables-addons -_kernflavor=grsec +_kflavor=${FLAVOR:-grsec} _kernver=2.6.28.9 -pkgver=1.13 + +pkgname=xtables-addons +pkgver=1.14 pkgrel=0 pkgdesc="Xtables-addons is the successor to patch-o-matic(-ng)" url="http://jengelh.medozas.de/projects/xtables/" license="GPL" -depends="linux-grsec" -makedepends="linux-grsec-dev linux-grsec-sources iptables-dev pkgconfig" +depends="linux-$_kflavor" +makedepends="linux-${_kflavor}-dev linux-${_kflavor}-sources iptables-dev pkgconfig" install= -subpackages="$pkgname-doc $pkgname-grsec:mod" +subpackages="$pkgname-doc $pkgname-${_kflavor}:mod" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 $pkgname-1.12-readlink.patch" build() { - local kout="$srcdir"/grsec + local kout="$srcdir"/$_kflavor mkdir -p "$kout" cd "$kout" - cp /usr/share/linux-grsec/config .config - make -C /usr/src/linux-$_kernver-grsec O=$PWD silentoldconfig \ + cp /boot/config-$_kflavor .config || return 1 + cp /boot/Module.symvers-$_kflavor Module.symvers || return 1 + make -C /usr/src/linux-$_kernver-$_kflavor O=$PWD silentoldconfig \ || return 1 make modules_prepare - cd "$srcdir/xtables-addons-$pkgver" + cd "$srcdir/$pkgname-$pkgver" for i in ../*.patch; do msg "Applying $i..." patch -p1 < $i || return @@ -32,9 +34,9 @@ build() { ./configure --prefix=/usr \ --with-kbuild="$kout" - make || return 1 + make CC="$CC" || return 1 make DESTDIR="$pkgdir" install } -md5sums="7c9cd60a00c2d4b9bed76cf4cec22fa1 xtables-addons-1.13.tar.bz2 +md5sums="a17b178d137480b870a7aeb54aea44f8 xtables-addons-1.14.tar.bz2 22bb434696be0960a6c758de17420e18 xtables-addons-1.12-readlink.patch" |