aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/abuild/APKBUILD4
-rw-r--r--main/acf-apk-tools/APKBUILD6
-rw-r--r--main/alpine-baselayout/APKBUILD9
-rw-r--r--main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch43
-rw-r--r--main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch38
-rw-r--r--main/alpine-conf/APKBUILD12
-rw-r--r--main/apk-tools/APKBUILD3
-rw-r--r--main/busybox-initscripts/APKBUILD22
-rw-r--r--main/busybox-initscripts/acpid.initd20
-rw-r--r--main/busybox/APKBUILD6
-rw-r--r--main/busybox/busybox-sed-3.patch120
-rw-r--r--main/busybox/busybox.post-install3
l---------main/busybox/busybox.post-upgrade1
-rw-r--r--main/chrony/APKBUILD6
-rw-r--r--main/chrony/chrony.logrotate11
-rw-r--r--main/conntrack-tools/APKBUILD4
-rw-r--r--main/dhcp/APKBUILD9
-rw-r--r--main/dhcp/linux_ipv6_discover.patch50
-rw-r--r--main/samba/APKBUILD8
-rw-r--r--x11/intltool/APKBUILD2
20 files changed, 253 insertions, 124 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index a17597b1d9..f8f5aa49d5 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=2.0_rc6
+pkgver=2.0_rc7
pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
@@ -17,4 +17,4 @@ build() {
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="6e3332501deab8d0b71a66822aebb77a abuild-2.0_rc6.tar.bz2"
+md5sums="cde72d1673d60a069c421c750d157c16 abuild-2.0_rc7.tar.bz2"
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 830d3242ce..4e46e50649 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
pkgname=acf-apk-tools
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.4.0
+pkgrel=0
pkgdesc="ACF module for apk"
url="http://git.alpinelinux.org/cgit/acf-apk-tools"
license="GPL-2"
@@ -13,4 +13,4 @@ build() {
make DESTDIR="$pkgdir" install
}
-md5sums="155b7f010cb0afc5bd012a4872d8d959 acf-apk-tools-0.3.1.tar.bz2"
+md5sums="6ccc261d430335b568b21bdb96e9dfe4 acf-apk-tools-0.4.0.tar.bz2"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index ffa96bd446..c329e1ae27 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,20 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
-pkgver=2.0_beta1
-pkgrel=1
+pkgver=2.0_beta2
+pkgrel=0
pkgdesc="Alpine base dir structure and init scripts"
url=http://git.alpinelinux.org/cgit/alpine-baselayout
depends=
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-profile-change-default-path.patch
"
license=GPL-2
build() {
cd "$srcdir"/$pkgname-$pkgver
- patch -p1 < ../0001-profile-change-default-path.patch || return 1
make
make install PREFIX= DESTDIR="$pkgdir" || return 1
}
-md5sums="6b25fc0c261e9182a68582c38249a3e8 alpine-baselayout-2.0_beta1.tar.bz2
-085c7e50bb57307fd9a24ee8c14e4749 0001-profile-change-default-path.patch"
+md5sums="962bcd31be3ce2db90e997ddc9f612fc alpine-baselayout-2.0_beta2.tar.bz2"
diff --git a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch b/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
deleted file mode 100644
index f7ce644d44..0000000000
--- a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fbe26c92439f4b4f19ee09ec07798a5bbaec0d77 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 29 Jul 2009 19:30:36 +0000
-Subject: [PATCH] lbu: remove packages.list if exist
-
-fixes http://redmine.alpinelinux.org/issues/show/94
----
- lbu.in | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 48e615e..b84682a 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -233,6 +233,12 @@ cmd_package() {
- tmppkg="$tmpdir/$(basename $pkg)"
-
- cd "${ROOT:-/}"
-+ # remove old package.list
-+ if [ -f etc/lbu/packages.list ] && [ -f var/lib/apk/world ]; then
-+ echo "Note: Removing /etc/lbu/packages.list."
-+ echo " /var/lib/apk/world will be used."
-+ rm -f etc/lbu/packages.list
-+ fi
- currentlist=$(apk audit --backup -q)
- if [ -f var/lib/apk/world ]; then
- currentlist="$currentlist var/lib/apk/world"
-@@ -391,10 +397,10 @@ cmd_commit() {
- }' | xargs rm 2>/dev/null
-
- # remove obsolete file. some older version of alpine needs this
-- # to be ble to upgrade
-+ # to be able to upgrade
- if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then
- echo "Note: Removing packages.list from $(basename $mnt)."
-- echo " $PACKAGES_LIST will be used."
-+ echo " /var/lib/apk/world will be used."
- rm -f $mnt/packages.list
- fi
-
---
-1.6.3.3
-
diff --git a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch b/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
deleted file mode 100644
index 066c8a02e3..0000000000
--- a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2e3bdc6d581b3efc5446d3b765272f7125bc0cba Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Aug 2009 12:08:06 +0000
-Subject: [PATCH 2/2] setup-disk: copy apk config to new root
-
----
- setup-disk.in | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 6a90d3a..e1a2c6d 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -42,8 +42,12 @@ install_mounted_root() {
-
- echon "Installing system on $rootdev: "
- lbu package - | tar -C "$mnt" -zx
-+ # apk reads config from target root so we need to copy the config
-+ mkdir -p "$mnt"/etc/apk/keys/
-+ cp /etc/apk/keys/* "$mnt"/etc/apk/keys/
-+
- apk add -q --progress --root "$mnt" $(cat "$mnt"/var/lib/apk/world) \
-- linux-grsec acct mkinitfs
-+ acct linux-grsec alpine-base >/dev/null || return 1
- echo ""
- # make things bootable
- kernel=$(ls "$mnt"/lib/modules)
-@@ -61,7 +65,6 @@ install_mounted_root() {
- rootdisk="$rootdisk /dev/${i}"
- done
- fi
-- chroot "$mnt" /sbin/mkinitfs -F "$features" $kernel
-
- # create an extlinux.conf
- sed '/append initrd/d' /media/*/syslinux.cfg > "$mnt"/boot/extlinux.conf
---
-1.6.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e520e1e746..fc8d2dec96 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,26 +1,20 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=2.0_beta3
-pkgrel=2
+pkgver=2.0_beta4
+pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
depends="openrc"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-lbu-remove-packages.list-if-exist.patch
- 0002-setup-disk-copy-apk-config-to-new-root.patch
"
license="GPL-2"
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../0001-lbu-remove-packages.list-if-exist.patch || return 1
- patch -p1 -i ../0002-setup-disk-copy-apk-config-to-new-root.patch || return 1
make || return 1
make install PREFIX= DESTDIR="$pkgdir"
for i in commit exclude include status update; do
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="7786d6d526e96a3fdf51b9284d063caa alpine-conf-2.0_beta3.tar.bz2
-b09f9702fc6599fcb7d9bfbc855c8b5c 0001-lbu-remove-packages.list-if-exist.patch
-6b32656c7d90567084753471fe9df972 0002-setup-disk-copy-apk-config-to-new-root.patch"
+md5sums="8228e51fd221284ee79aaeb889763a68 alpine-conf-2.0_beta4.tar.bz2"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index ea77fa6855..fd2c351253 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0_rc3
-pkgrel=0
+pkgrel=3
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
@@ -27,6 +27,7 @@ build() {
ln -s apk apk_index
ln -s apk apk_info
ln -s apk apk_version
+ install -d "$pkgdir"/var/lib/apk "$pkgdir"/var/cache/misc
}
static() {
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 7ab2e33329..83e145aa0a 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
pkgver=2.0
-pkgrel=4
+pkgrel=5
pkgdesc="Init scripts for busybox daemons"
url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
license="GPL-2"
@@ -10,17 +10,18 @@ depends="busybox"
makedepends=
install=$pkgname.post-install
subpackages=
-source="cron.initd dnsd.initd httpd.initd inetd.initd klogd.initd
+source="acpid.initd cron.initd dnsd.initd httpd.initd inetd.initd klogd.initd
mdev-mount.initd mdev.initd rdate.initd syslog.initd watchdog.initd
cron.confd klogd.confd rdate.confd syslog.confd watchdog.confd
mdev.conf dvbdev ide_links usbdev usbdisk_link
- $install"
+ "
build() {
local i
cd "$srcdir"
- mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/lib/mdev
+ mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/lib/mdev\
+ "$pkgdir"/etc/acpi/PWRF
for i in *.initd; do
install -m755 "$srcdir"/$i "$pkgdir"/etc/init.d/${i%.*} || return 1
done
@@ -29,9 +30,17 @@ build() {
done
install -m644 mdev.conf "$pkgdir"/etc
install -m755 dvbdev ide_links usbdev usbdisk_link "$pkgdir"/lib/mdev/
+
+ # poweroff script for acpid
+ cat >"$pkgdir"/etc/acpi/PWRF/00000080 <<EOF
+#!/bin/sh
+poweroff
+EOF
+
}
-md5sums="131e46b2853439f436bc377a5473273f cron.initd
+md5sums="baa44c026a4c9468b01ec2771d76db19 acpid.initd
+131e46b2853439f436bc377a5473273f cron.initd
3af526f4de1a607f7932a15f7c8e8eb1 dnsd.initd
f7daf05f9984aa398fdbd3fe02e82678 httpd.initd
dad8e381142dfb42483de324aff4cf28 inetd.initd
@@ -50,5 +59,4 @@ b5b23dd06cea120bd8d850b54bca0b59 syslog.initd
ad1556961294e4aa2abca6be52138b7c dvbdev
5c8725b4cbdeda23b00f08124a0d20bf ide_links
1acfd58dfd1cf324c90ca3a3be519510 usbdev
-30b0c85956b6701caf55309a17e537f6 usbdisk_link
-038db8453f57a36afaee2a4d883008e4 busybox-initscripts.post-install"
+30b0c85956b6701caf55309a17e537f6 usbdisk_link"
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-initscripts/acpid.initd
new file mode 100644
index 0000000000..548d4ba404
--- /dev/null
+++ b/main/busybox-initscripts/acpid.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+
+depend() {
+ need dev
+ after hwdrivers modules
+}
+
+start() {
+ ebegin "Starting busybox acpid"
+ start-stop-daemon --start --exec /sbin/acpid \
+ -- $ACPID_OPTS
+ eend $?
+}
+
+stop () {
+ ebegin "Stopping busybox acpid"
+ start-stop-daemon --stop --exec /sbin/acpid
+ eend $?
+}
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index d5e7a5b557..7fb318c1bd 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,17 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.14.3
-pkgrel=1
+pkgrel=4
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license="GPL-2"
depends=
-install= #"$pkgname.post-install $pkgname.post-upgrade"
+install="$pkgname.post-install $pkgname.post-upgrade"
triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
$pkgname-1.11.1-bb.patch
0001-install-compat-fix-for-mode-of-created-files.patch
bb-tar-numeric-owner.patch
+ busybox-sed-3.patch
busyboxconfig"
build() {
@@ -48,4 +49,5 @@ md5sums="d170bf5f97a41aec3a505eab690d5699 busybox-1.14.3.tar.bz2
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
73d39c57483084298c7e46bdbbbea8d1 0001-install-compat-fix-for-mode-of-created-files.patch
0b5b2d7db201f90cd08f4a3164ee29a1 bb-tar-numeric-owner.patch
+b75c3f419f8392dfdadd92aa24fdba8c busybox-sed-3.patch
0be49dc673a849b5bf5e670db8c8c7b6 busyboxconfig"
diff --git a/main/busybox/busybox-sed-3.patch b/main/busybox/busybox-sed-3.patch
new file mode 100644
index 0000000000..f916ce2911
--- /dev/null
+++ b/main/busybox/busybox-sed-3.patch
@@ -0,0 +1,120 @@
+diff -d -urpN busybox.2/editors/sed.c busybox.3/editors/sed.c
+--- busybox.2/editors/sed.c 2009-08-08 01:40:42.000000000 +0200
++++ busybox.3/editors/sed.c 2009-08-17 01:32:00.000000000 +0200
+@@ -589,7 +589,7 @@ static void pipe_putc(char c)
+
+ static void do_subst_w_backrefs(char *line, char *replace)
+ {
+- int i,j;
++ int i, j;
+
+ /* go through the replacement string */
+ for (i = 0; replace[i]; i++) {
+@@ -624,23 +624,24 @@ static void do_subst_w_backrefs(char *li
+ }
+ }
+
+-static int do_subst_command(sed_cmd_t *sed_cmd, char **line)
++static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
+ {
+- char *oldline = *line;
++ char *line = *line_p;
+ int altered = 0;
+ unsigned match_count = 0;
+ regex_t *current_regex;
+
++ current_regex = sed_cmd->sub_match;
+ /* Handle empty regex. */
+- if (sed_cmd->sub_match == NULL) {
++ if (!current_regex) {
+ current_regex = G.previous_regex_ptr;
+ if (!current_regex)
+ bb_error_msg_and_die("no previous regexp");
+- } else
+- G.previous_regex_ptr = current_regex = sed_cmd->sub_match;
++ }
++ G.previous_regex_ptr = current_regex;
+
+ /* Find the first match */
+- if (REG_NOMATCH == regexec(current_regex, oldline, 10, G.regmatch, 0))
++ if (REG_NOMATCH == regexec(current_regex, line, 10, G.regmatch, 0))
+ return 0;
+
+ /* Initialize temporary output buffer. */
+@@ -657,7 +658,7 @@ static int do_subst_command(sed_cmd_t *s
+ The match_count check is so not to break
+ echo "hi" | busybox sed 's/^/!/g' */
+ if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
+- pipe_putc(*oldline++);
++ pipe_putc(*line++);
+ continue;
+ }
+
+@@ -669,35 +670,41 @@ static int do_subst_command(sed_cmd_t *s
+ && (sed_cmd->which_match != match_count)
+ ) {
+ for (i = 0; i < G.regmatch[0].rm_eo; i++)
+- pipe_putc(*oldline++);
++ pipe_putc(*line++);
+ continue;
+ }
+
+ /* print everything before the match */
+ for (i = 0; i < G.regmatch[0].rm_so; i++)
+- pipe_putc(oldline[i]);
++ pipe_putc(line[i]);
+
+ /* then print the substitution string */
+- do_subst_w_backrefs(oldline, sed_cmd->string);
++ do_subst_w_backrefs(line, sed_cmd->string);
+
+ /* advance past the match */
+- oldline += G.regmatch[0].rm_eo;
++ line += G.regmatch[0].rm_eo;
+ /* flag that something has changed */
+ altered++;
+
+ /* if we're not doing this globally, get out now */
+ if (sed_cmd->which_match)
+ break;
+- } while (*oldline && (regexec(current_regex, oldline, 10, G.regmatch, 0) != REG_NOMATCH));
+
+- /* Copy rest of string into output pipeline */
++ if (*line == '\0')
++ break;
++//maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL?
++ } while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
+
+- while (*oldline)
+- pipe_putc(*oldline++);
+- pipe_putc(0);
++ /* Copy rest of string into output pipeline */
++ while (1) {
++ char c = *line++;
++ pipe_putc(c);
++ if (c == '\0')
++ break;
++ }
+
+- free(*line);
+- *line = G.pipeline.buf;
++ free(*line_p);
++ *line_p = G.pipeline.buf;
+ return altered;
+ }
+
+diff -d -urpN busybox.2/testsuite/sed.tests busybox.3/testsuite/sed.tests
+--- busybox.2/testsuite/sed.tests 2009-08-08 01:40:44.000000000 +0200
++++ busybox.3/testsuite/sed.tests 2009-08-17 01:29:01.000000000 +0200
+@@ -241,4 +241,11 @@ testing "sed 2d;2,1p (gnu compat)" \
+ "third\n" "" \
+ "first\nsecond\nthird\nfourth\n"
+
++# Regex means: "match / at BOL or nothing, then one or more not-slashes".
++# The bug was that second slash in /usr/lib was treated as "at BOL" too.
++testing "sed beginning (^) matches only once" \
++ "sed 's,\(^/\|\)[^/][^/]*,>\0<,g'" \
++ ">/usr</>lib<\n" "" \
++ "/usr/lib\n"
++
+ exit $FAILCOUNT
diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install
new file mode 100644
index 0000000000..8baed730c6
--- /dev/null
+++ b/main/busybox/busybox.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/bin/busybox --install -s
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
new file mode 120000
index 0000000000..1f4b450e5e
--- /dev/null
+++ b/main/busybox/busybox.post-upgrade
@@ -0,0 +1 @@
+busybox.post-install \ No newline at end of file
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 21f8924a66..a625e6959a 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chrony
pkgver=1.23
-pkgrel=2
+pkgrel=3
pkgdesc="NTP client and server programs"
url="http://chrony.sunsite.dk/"
license="GPL-2"
-depends=
+depends="logrotate"
makedepends="texinfo"
subpackages="$pkgname-doc"
source="http://chrony.sunsite.dk/download/$pkgname-$pkgver.tar.gz
@@ -16,6 +16,7 @@ source="http://chrony.sunsite.dk/download/$pkgname-$pkgver.tar.gz
$pkgname-1.23-reply-ip.diff
chronyd.confd
chronyd.initd
+ chrony.logrotate
chrony.conf
"
@@ -57,4 +58,5 @@ d47015a34b6b2f9eebca77ef939cec72 chrony-1.21-makefile.diff
caa6589a1a1cd56f64957e312d1ef84c chrony-1.23-reply-ip.diff
d5c09be46226774d22c08c5a4c28093a chronyd.confd
dac8aa4913d7c323abfa1719ddd7e5e4 chronyd.initd
+468eaf2b5465d60b3ee021ce3f948ab1 chrony.logrotate
46f42c52953d398ca44d6baa449618d7 chrony.conf"
diff --git a/main/chrony/chrony.logrotate b/main/chrony/chrony.logrotate
new file mode 100644
index 0000000000..1b7b589a9f
--- /dev/null
+++ b/main/chrony/chrony.logrotate
@@ -0,0 +1,11 @@
+/var/log/chrony/*.log
+ sharedscripts
+ postrotate
+ PASSWORD=`awk '$1 ~ /^1$/ {print $2; exit}' /etc/chrony/chrony.keys`
+ cat << EOF | /usr/bin/chronyc | sed '/^200 OK$/d'
+ password $PASSWORD
+ cyclelogs
+ EOF
+ endscript
+}
+
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 3bcc083032..5499931419 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=conntrack-tools
-pkgver=0.9.10
+pkgver=0.9.13
pkgrel=0
pkgdesc="Connection tracking userspace tools"
url="http://conntrack-tools.netfilter.org"
@@ -23,6 +23,6 @@ build() {
install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
install -Dm644 doc/stats/conntrackd.conf "$pkgdir"/etc/conntrackd
}
-md5sums="cd46ed2d5cd4797add0cd444a209c1e7 conntrack-tools-0.9.10.tar.bz2
+md5sums="bd0e2149a1626071db83c4f9714e0556 conntrack-tools-0.9.13.tar.bz2
144831a8a79561ef184b84ba94f0837b conntrackd.initd
8ebf3838b69d20e6bb4a173844502039 conntrackd.confd"
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 284e15eeea..c73f945576 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
pkgname=dhcp
pkgver=4.1.0_p1
_realver=4.1.0p1
-pkgrel=1
+pkgrel=2
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
license="GPL"
@@ -11,12 +11,13 @@ makedepends=
install="dhcp.pre-install dhcp.pre-upgrade dhcp.post-upgrade"
subpackages="$pkgname-doc $pkgname-dev dhclient"
source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz
- $install
+ linux_ipv6_discover.patch
dhcpd.confd
dhcpd.initd"
build() {
cd "$srcdir/$pkgname-$_realver"
+ patch -p1 -i ../linux_ipv6_discover.patch || return 1
./configure --prefix=/usr \
--sysconfdir=/etc/dhcp \
@@ -49,8 +50,6 @@ dhclient() {
}
md5sums="325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz
-19b28380eaae7d26027c29b623aeee07 dhcp.pre-install
-6cc49497f3c30ccd37fc7c032f7810c6 dhcp.pre-upgrade
-36d562e5b0e55a36e4224fd7cb843f6a dhcp.post-upgrade
+37abf1fb047a353e91b022fafdabf39a linux_ipv6_discover.patch
df32707f5bbe5363306420b5dc6e6b40 dhcpd.confd
6ed5ddba2b445ef60d27a8b7f5a0ee0b dhcpd.initd"
diff --git a/main/dhcp/linux_ipv6_discover.patch b/main/dhcp/linux_ipv6_discover.patch
new file mode 100644
index 0000000000..ebf3865e6a
--- /dev/null
+++ b/main/dhcp/linux_ipv6_discover.patch
@@ -0,0 +1,50 @@
+diff -Naur dhcp-4.1.0a2/common/discover.c dhcp-4.1.0a2-mcn/common/discover.c
+--- dhcp-4.1.0a2/common/discover.c 2008-08-29 18:48:57.000000000 +0100
++++ dhcp-4.1.0a2-mcn/common/discover.c 2008-10-02 13:02:06.000000000 +0100
+@@ -443,15 +443,17 @@
+ }
+
+ #ifdef DHCPv6
+- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
+- if (ifaces->fp6 == NULL) {
+- log_error("Error opening '/proc/net/if_inet6' to "
+- "list IPv6 interfaces; %m");
+- close(ifaces->sock);
+- ifaces->sock = -1;
+- fclose(ifaces->fp);
+- ifaces->fp = NULL;
+- return 0;
++ if (local_family == AF_INET6) {
++ ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
++ if (ifaces->fp6 == NULL) {
++ log_error("Error opening '/proc/net/if_inet6' to "
++ "list IPv6 interfaces; %m");
++ close(ifaces->sock);
++ ifaces->sock = -1;
++ fclose(ifaces->fp);
++ ifaces->fp = NULL;
++ return 0;
++ }
+ }
+ #endif
+
+@@ -720,7 +722,8 @@
+ }
+ #ifdef DHCPv6
+ if (!(*err)) {
+- return next_iface6(info, err, ifaces);
++ if (local_family == AF_INET6)
++ return next_iface6(info, err, ifaces);
+ }
+ #endif
+ return 0;
+@@ -736,7 +739,8 @@
+ close(ifaces->sock);
+ ifaces->sock = -1;
+ #ifdef DHCPv6
+- fclose(ifaces->fp6);
++ if (local_family == AF_INET6)
++ fclose(ifaces->fp6);
+ ifaces->fp6 = NULL;
+ #endif
+ }
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 1e740cb506..d0016e2fe3 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
pkgver=3.3.7
-pkgrel=0
+pkgrel=1
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
license="GPL3"
@@ -67,13 +67,14 @@ winbind() {
usr/bin/wbinfo \
usr/bin/ntlm_auth \
usr/sbin/winbindd \
- usr/lib/samba/idmap \
- usr/lib/libwbclient*
+ usr/lib/samba/idmap
}
common() {
pkgdesc="Samba common files for both client an servers"
depends=
+ # we have moved libwbclient to samba-common
+ replaces="winbind"
cd "$pkgdir"
_mv_files \
usr/bin/net \
@@ -82,6 +83,7 @@ common() {
usr/bin/testparm \
usr/lib/samba/*.dat \
usr/lib/libtalloc* \
+ usr/lib/libwbclient* \
var/run/samba \
var/cache/samba \
var/log/samba
diff --git a/x11/intltool/APKBUILD b/x11/intltool/APKBUILD
index 9b817d3428..bf231ce614 100644
--- a/x11/intltool/APKBUILD
+++ b/x11/intltool/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=intltool
pkgver=0.40.6
-pkgrel=1
+pkgrel=2
pkgdesc="The internationalization tool collection"
url="http://freedesktop.org/wiki/Software/intltool"
license="GPL"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 09:15:16 +0000