Commit e5ea0988 authored by Ted Trask's avatar Ted Trask

Merge branch '1.9' of git://dev.alpinelinux.org/aports into 1.9

parents 3665f899 0e116bf2
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.0_rc9
pkgver=2.0
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
......@@ -18,4 +18,4 @@ build() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
md5sums="2eec332e42c5573b89d1f165dac2796f alpine-conf-2.0_rc9.tar.bz2"
md5sums="0aa966ef854de61b375d7e08bdb105b4 alpine-conf-2.0.tar.bz2"
From d67ee300b6cbd9deaaa8c5e506e836e253f7b77d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 Dec 2009 07:02:32 +0000
Subject: [PATCH 1/2] state: Default interactive action is Yes
When pressing only <enter> on the question "..continue [Y/n]?" then
lets take that as a "yes"
---
src/state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/state.c b/src/state.c
index 94afe86..1bd29bf 100644
--- a/src/state.c
+++ b/src/state.c
@@ -771,7 +771,7 @@ int apk_state_commit(struct apk_state *state,
printf("Do you want to continue [Y/n]? ");
fflush(stdout);
r = fgetc(stdin);
- if (r != 'y' && r != 'Y')
+ if (r != 'y' && r != 'Y' && r != '\n')
return -1;
}
}
--
1.6.5.7
From 3f9fe4c28be7987bd404f06e27ed03aafd8e8b52 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Fri, 25 Dec 2009 14:14:40 +0200
Subject: [PATCH 2/2] db: keep packages with no files with installed status
got broke few commits ago when apk_pkg_installed() call was
moved to happen after the package name has been read.
---
src/database.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/database.c b/src/database.c
index 5118f5c..2fcb275 100644
--- a/src/database.c
+++ b/src/database.c
@@ -587,17 +587,21 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo)
}
/* Standard index line? */
- if (apk_pkg_add_info(db, pkg, field, l) == 0)
+ if (apk_pkg_add_info(db, pkg, field, l) == 0) {
+ if (repo == -1 && field == 'S') {
+ /* Instert to installed database; this needs to
+ * happen after package name has been read, but
+ * before first FDB entry. */
+ ipkg = apk_pkg_install(db, pkg);
+ diri_node = hlist_tail_ptr(&ipkg->owned_dirs);
+ }
continue;
+ }
- if (repo != -1) {
+ if (repo != -1 || ipkg == NULL) {
apk_error("Invalid index entry '%c'", field);
return -1;
}
- if (ipkg == NULL) {
- ipkg = apk_pkg_install(db, pkg);
- diri_node = hlist_tail_ptr(&ipkg->owned_dirs);
- }
/* Check FDB special entries */
switch (field) {
--
1.6.5.7
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0_rc7
pkgrel=0
pkgver=2.0
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
0001-state-Default-interactive-action-is-Yes.patch
0002-db-keep-packages-with-no-files-with-installed-status.patch
"
......@@ -40,4 +42,6 @@ static() {
"$subpkgdir"/sbin/apk.static
}
md5sums="8654e4e4e32ead79560890567caaea5e apk-tools-2.0_rc7.tar.bz2"
md5sums="dc827e62065c940bbcec1c93099a5718 apk-tools-2.0.tar.bz2
36e514cbc781759dbb6eb84e35f6072d 0001-state-Default-interactive-action-is-Yes.patch
180368300d46c5b6de0d5eb43d90547e 0002-db-keep-packages-with-no-files-with-installed-status.patch"
......@@ -2,7 +2,7 @@
pkgname=dhcp
pkgver=4.1.0_p1
_realver=4.1.0p1
pkgrel=4
pkgrel=5
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
license="GPL"
......@@ -12,13 +12,18 @@ install="dhcp.pre-install dhcp.post-install dhcp.pre-upgrade dhcp.post-upgrade"
subpackages="$pkgname-doc $pkgname-dev dhclient"
source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz
linux_ipv6_discover.patch
dhcp-3.0-fix-perms.patch
dhcpd.confd
dhcpd.initd"
build() {
prepare() {
cd "$srcdir/$pkgname-$_realver"
patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1
patch -p1 -i ../linux_ipv6_discover.patch || return 1
}
build() {
cd "$srcdir/$pkgname-$_realver"
./configure --prefix=/usr \
--sysconfdir=/etc/dhcp \
--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
......@@ -31,6 +36,10 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info
make || return 1
}
package() {
cd "$srcdir/$pkgname-$_realver"
make DESTDIR="$pkgdir" install
install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd
......@@ -51,5 +60,6 @@ dhclient() {
md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz
37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch
a9eaf182dae3984670da52f20ae10fba dhcp-3.0-fix-perms.patch
df32707f5bbe5363306420b5dc6e6b40 dhcpd.confd
be2259371681bd4ab8a577b1b1a989ae dhcpd.initd"
--- a/server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800
+++ b/server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800
@@ -602,6 +602,12 @@
if (lftest)
exit (0);
+#if defined (PARANOIA)
+ /* Set proper permissions... */
+ if (lchown (path_dhcpd_db, set_uid, set_gid))
+ log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
+#endif /* PARANOIA */
+
/* Discover all the network interfaces and initialize them. */
discover_interfaces (DISCOVER_SERVER);
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=igmpproxy
pkgver=0.1_beta4
pkgrel=2
pkgver=0.1
pkgrel=0
pkgdesc="a simple dynamic Multicast Routing Daemon using only IGMP signalling"
url="http://sourceforge.net/projects/igmpproxy/"
license="GPL"
......@@ -31,4 +31,4 @@ build() {
# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
md5sums="0a16178aeca5d1bf54c129cec9597f85 igmpproxy-0.1_beta4.tar.gz"
md5sums="c56f41ec195bc1fe016369bf74efc5a1 igmpproxy-0.1.tar.gz"
......@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi
pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17}
pkgrel=18
pkgrel=0
pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
......@@ -24,14 +24,12 @@ install=
makedepends="linux-${_flavor}-dev=${_kernelver}"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$pkgver.tar.gz
iscsitarget-0.4.17+linux-2.6.28.patch
iscsitarget-0.4.17+linux-2.6.29.patch
iscsitarget-0.4.17+linux-2.6.30.patch
"
build() {
cd "$srcdir"/$_realname-$pkgver
for i in ../*.patch; do
[ -r "$i" ] || continue
msg "Applying $i"
patch -p1 < $i || return 1
done
......@@ -41,7 +39,4 @@ build() {
make KSRC="$ksrc" kernel || return 1
make KSRC="$ksrc" DISTDIR="$pkgdir" install-kernel || return 1
}
md5sums="e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz
f58dde50f72b04b7737b33e517e56208 iscsitarget-0.4.17+linux-2.6.28.patch
a7be10bb04c9014807e39db75c9cd468 iscsitarget-0.4.17+linux-2.6.29.patch
2f65d30d1766828fc87cac55a84e0b07 iscsitarget-0.4.17+linux-2.6.30.patch"
md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz"
From c5e70fc826aad5efb786c47d294e3c0c76246d63 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Diego=20E.=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Sat, 3 Jan 2009 00:09:43 +0100
Subject: [PATCH] Fix building with Linux kernel 2.6.28 and later.
With changeset 30c40d2c01f68c7eb1a41ab3552bdaf5dbf300d4 of the Linux
kernel, the functions open_bdev_excl and close_bdev_excl were replaced with
functionally-equivalent open_bdev_exclusive and close_bdev_exclusive.
The new interface uses fmode_t instead of integer flags to carry on the
opening mode for a block device, thus require some minor changes in the
calls.
---
kernel/block-io.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/kernel/block-io.c b/kernel/block-io.c
index e4a25f7..2c5f6f6 100644
--- a/kernel/block-io.c
+++ b/kernel/block-io.c
@@ -18,6 +18,14 @@
#include "iscsi_dbg.h"
#include "iotype.h"
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+# define HAVE_OPEN_BDEV_EXCLUSIVE 1
+#else
+# define HAVE_OPEN_BDEV_EXCLUSIVE 0
+#endif
+
struct blockio_data {
char *path;
struct block_device *bdev;
@@ -154,14 +160,22 @@ blockio_open_path(struct iet_volume *volume, const char *path)
{
struct blockio_data *bio_data = volume->private;
struct block_device *bdev;
+#if HAVE_OPEN_BDEV_EXCLUSIVE
+ fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
+#else
int flags = LUReadonly(volume) ? MS_RDONLY : 0;
+#endif
int err = 0;
bio_data->path = kstrdup(path, GFP_KERNEL);
if (!bio_data->path)
return -ENOMEM;
+#if HAVE_OPEN_BDEV_EXCLUSIVE
+ bdev = open_bdev_exclusive(path, mode, THIS_MODULE);
+#else
bdev = open_bdev_excl(path, flags, THIS_MODULE);
+#endif
if (IS_ERR(bdev)) {
err = PTR_ERR(bdev);
eprintk("Can't open device %s, error %d\n", path, err);
@@ -323,9 +337,16 @@ static void
blockio_detach(struct iet_volume *volume)
{
struct blockio_data *bio_data = volume->private;
+#if HAVE_OPEN_BDEV_EXCLUSIVE
+ fmode_t mode = FMODE_READ | ( LUReadonly(volume) ? 0 : FMODE_WRITE );
+#endif
if (bio_data->bdev)
+#if HAVE_OPEN_BDEV_EXCLUSIVE
+ close_bdev_exclusive(bio_data->bdev, mode);
+#else
close_bdev_excl(bio_data->bdev);
+#endif
kfree(bio_data->path);
kfree(volume->private);
--
1.6.0.6
From 81373580a641732a7e4610c3d39af0c68007b892 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Wed, 25 Mar 2009 16:14:46 +0100
Subject: [PATCH 2/2] Fix building with Linux kernel 2.6.29 and later.
When building for Linux 2.6.29 or later, instead of using the NIP6
macro (that has been removed) use the new %p6 format specifier.
---
kernel/conn.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/conn.c b/kernel/conn.c
index f96e2b6..ab561f9 100644
--- a/kernel/conn.c
+++ b/kernel/conn.c
@@ -6,6 +6,7 @@
#include <linux/file.h>
#include <linux/ip.h>
+#include <linux/version.h>
#include <net/tcp.h>
#include "iscsi.h"
@@ -47,8 +48,13 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
break;
case AF_INET6:
snprintf(buf, sizeof(buf),
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ "[%p6]",
+ &(inet6_sk(sk)->daddr));
+#else
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
NIP6(inet6_sk(sk)->daddr));
+#endif
break;
default:
break;
--
1.6.2
From cb1b94ffa91d71aba8e07ed018e9f43064e05a49 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Wed, 10 Jun 2009 17:24:02 +0200
Subject: [PATCH 3/3] Fix building with Linux kernel 2.6.30 and later.
With commit 99b76233803beab302123d243eea9e41149804f3 the proc_dir_entry
structure does not have an owner any longer, this just removes the
assignment to make the code build with the newer kernel.
---
kernel/config.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/config.c b/kernel/config.c
index d6c4b5e..34681f5 100644
--- a/kernel/config.c
+++ b/kernel/config.c
@@ -5,6 +5,7 @@
*/
#include <linux/proc_fs.h>
+#include <linux/version.h>
#include "iscsi.h"
#include "iscsi_dbg.h"
@@ -43,7 +44,9 @@ int iet_procfs_init(void)
if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
goto err;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
proc_iet_dir->owner = THIS_MODULE;
+#endif
for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
--
1.6.3.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iscsitarget
pkgver=0.4.17
pkgrel=3
pkgver=1.4.19
pkgrel=0
pkgdesc="Open Source iSCSI target with professional features - userspace utils"
url="http://iscsitarget.sourceforge.net/"
license="GPL-2"
......@@ -33,7 +33,7 @@ build() {
install -Dm755 ../ietd.confd "$pkgdir"/etc/conf.d/ietd
}
md5sums="e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz
md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz
22512c5cf4cb62127730ce53d74ff28f iscsitarget-0.4.15-isns-set-scn-flag.patch
c9a9b839b3afcdecd1601511ee48a171 iscsitarget-0.4.17-build.patch
9b0ca79dc47b12024c2b67d828d6d361 ietd.initd
......
From bf94c9b9aa7884fc50d3110d69e2d28e413159ed Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 24 Nov 2009 12:23:38 +0000
Subject: [PATCH] init: never overwrite existing files
ref #197
---
initramfs-init.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/initramfs-init.in b/initramfs-init.in
index 04798de..bd97ace 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -372,7 +372,7 @@ if [ -n "$KOPT_chart" ]; then
fi
apkflags="--initdb --quiet --progress --force --no-network"
if [ -z "$KOPT_keep_apk_new" ]; then
- apkflags="$apkflags --clean-protected"
+ apkflags="$apkflags --clean-protected --never-overwrite"
fi
apk add --root $sysroot $repo_opt $apkflags $pkgs >/dev/null
eend $?
--
1.6.5.3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=2.0_rc6
pkgrel=1
pkgver=2.0_rc7
pkgrel=0
pkgdesc="Tool to generate initramfs images for Alpine"
url=http://git.alpinelinux.org/cgit/mkinitfs
depends="busybox apk-tools>=2.0_rc7"
depends="busybox apk-tools>=2.0"
triggers="$pkgname.trigger:/usr/share/kernel/*"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
0001-init-never-overwrite-existing-files.patch
"
license="GPL-2"
build() {
cd "$srcdir"/$pkgname-$pkgver
patch -p1 -i ../0001-init-never-overwrite-existing-files.patch || return 1
make || return 1
make install DESTDIR="$pkgdir" || return 1
}
md5sums="6b8945b2e3be747caf8cfb29230f180e mkinitfs-2.0_rc6.tar.bz2
921aadd7e302d5e565e539e611be946e 0001-init-never-overwrite-existing-files.patch"
md5sums="1e4ec2bb620f080699fddb40e273e33c mkinitfs-2.0_rc7.tar.bz2"
......@@ -3,16 +3,19 @@
for i in "$@"; do
# get last element in path
flavor=${i##*/}
if ! [ -f "$i"/kernel.release ]; then
# kernel was uninstalled
rm -f $( readlink -f /boot/initramfs-$flavor ) \
/boot/initramfs-$flavor /boot/vmlinuz-$flavor \
/boot/$flavor /boot/$flavor.gz /$flavor /$flavor.gz
continue
fi
abi_release=$(cat "$i"/kernel.release)
initfs=initramfs-$abi_release
mkinitfs -o /boot/$initfs $abi_release
ln -sf $initfs /boot/initramfs-$flavor
ln -sf vmlinuz-$abi_release /boot/vmlinuz-$flavor
# extlinux will use path relative partition, so if /boot is on a
# separate partition we want /boot/<kernel> resolve to /<kernel>
[ -e /boot/boot ] || ln -sf / /boot/boot
#this is for compat. to be removed eventually...
ln -sf vmlinuz-$flavor /boot/$flavor
ln -sf initramfs-$flavor /boot/$flavor.gz
......@@ -29,3 +32,9 @@ for i in "$@"; do
fi
done
# extlinux will use path relative partition, so if /boot is on a
# separate partition we want /boot/<kernel> resolve to /<kernel>
if ! [ -e /boot/boot ]; then
ln -sf / /boot/boot
fi
......@@ -3,7 +3,7 @@
pkgname=squid
pkgver=2.7.7
_ver=2.7.STABLE7
pkgrel=0
pkgrel=2
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade squid.post-install"
......@@ -74,7 +74,7 @@ build() {
--enable-removal-policies="lru,heap" \
--enable-digest-auth-helpers="password" \
--enable-storeio="aufs,ufs,diskd,coss,null" \
--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM" \
--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \
--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
--enable-delay-pools --enable-arp-acl --enable-ssl \
......@@ -82,7 +82,8 @@ build() {
--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
--enable-follow-x-forwarded-for \
--with-large-files
make || return 1
make DESTDIR="$pkgdir" install
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sox
pkgver=14.3.0
pkgrel=0
pkgdesc="The Swiss Army knife of sound processing tools"
url="http://sox.sourceforge.net/"
license="GPL LGPL"
makedepends="ffmpeg-dev libao-dev libvorbis-dev libogg-dev lame-dev
libmad-dev bash alsa-lib-dev libsndfile-dev libsamplerate-dev
libtool file-dev libid3tag-dev"
depends=
subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
sox-uclibc.patch"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
patch -p1 -i ../sox-uclibc.patch
}
build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-dyn-default \
--with-distro="Alpine Linux" || return 1
make || return 1
}
package() {
cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install || return 1
ln -sf play "$pkgdir"/usr/bin/rec || return 1
ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7
}
md5sums="8e3509804e6227273ef84092e1a2fea7 sox-14.3.0.tar.gz
d8267f718ba6b4fb2f48c5104af31364 sox-uclibc.patch"
diff --git a/src/formats.c b/src/formats.c
index 556f611..6c2c5b0 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -395,7 +395,7 @@ static void UNUSED rewind_pipe(FILE * fp)
#if defined _NEWLIB_VERSION || defined __APPLE__
fp->_p -= AUTO_DETECT_SIZE;
fp->_r += AUTO_DETECT_SIZE;
-#elif defined __GLIBC__
+#elif defined __GLIBC__ && ! defined __UCLIBC__
fp->_IO_read_ptr = fp->_IO_read_base;
#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H
fp->_ptr = fp->_base;
@@ -403,7 +403,7 @@ static void UNUSED rewind_pipe(FILE * fp)
/* To fix this #error, either simply remove the #error line and live without
* file-type detection with pipes, or add support for your compiler in the
* lines above. Test with cat monkey.au | ./sox --info - */
- #error FIX NEEDED HERE
+/* #error FIX NEEDED HERE */
#define NO_REWIND_PIPE
(void)fp;
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment