aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-10-08 14:50:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-10-08 14:51:45 +0000
commit9169f49c9770b5ae9c405240826c4874f4dca5e3 (patch)
tree4adb96e366ffcac9b022460b63b439b5c4f6886a
parentb358b0c58416588e1bea619dfdb5d1aa81012f51 (diff)
downloadalpine_aports-9169f49c9770b5ae9c405240826c4874f4dca5e3.tar.bz2
alpine_aports-9169f49c9770b5ae9c405240826c4874f4dca5e3.tar.xz
alpine_aports-9169f49c9770b5ae9c405240826c4874f4dca5e3.zip
main/busybox-initscripts: httpd does not generate pid file
fixes #2276 (cherry picked from commit 5227f68825a4e1ac77a98e3f348dedf8ad7c4cd4)
-rw-r--r--main/busybox-initscripts/APKBUILD10
-rw-r--r--main/busybox-initscripts/httpd.initd2
2 files changed, 5 insertions, 7 deletions
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 7e2b71b269..9bfac7e91a 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
2# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 2# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
3pkgname=busybox-initscripts 3pkgname=busybox-initscripts
4pkgver=2.2 4pkgver=2.2
5pkgrel=14 5pkgrel=15
6pkgdesc="Init scripts for busybox daemons" 6pkgdesc="Init scripts for busybox daemons"
7url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts" 7url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
8arch="noarch" 8arch="noarch"
@@ -48,13 +48,13 @@ EOF
48 # script for udhcpc 48 # script for udhcpc
49 install -Dm755 "$srcdir"/default.script \ 49 install -Dm755 "$srcdir"/default.script \
50 "$pkgdir"/usr/share/udhcpc/default.script || return 1 50 "$pkgdir"/usr/share/udhcpc/default.script || return 1
51 51
52} 52}
53 53
54md5sums="8928e7df8723012df7350d40a2729b58 acpid.initd 54md5sums="8928e7df8723012df7350d40a2729b58 acpid.initd
554ff6e85fb231c9067f10d9dd446852da cron.initd 554ff6e85fb231c9067f10d9dd446852da cron.initd
56dc825f26e9153f8f7d77162c66f7d876 dnsd.initd 56dc825f26e9153f8f7d77162c66f7d876 dnsd.initd
57a3397fe8946b7fff6a0a953d8968d5ae httpd.initd 5735bdb64517fd0fd0d0af075a4d2122e4 httpd.initd
582bb9d1064d8b0dcceb4dac95bf8746ba inetd.initd 582bb9d1064d8b0dcceb4dac95bf8746ba inetd.initd
598b7ced45d0880e3f1b6a1047520de035 klogd.initd 598b7ced45d0880e3f1b6a1047520de035 klogd.initd
606de9bac27127a7e1dbcc86acbc920521 mdev-mount.initd 606de9bac27127a7e1dbcc86acbc920521 mdev-mount.initd
@@ -77,7 +77,7 @@ c6470658e54f040bb85cb1fc7b56f10c default.script"
77sha256sums="894bf4edd028433bcfa5863b225387a94db477e9b4319f1655dd74907366d245 acpid.initd 77sha256sums="894bf4edd028433bcfa5863b225387a94db477e9b4319f1655dd74907366d245 acpid.initd
789e631207340e1879318ad377b9d74ad77978c5db8bcea1bb0a4871525d67a8e7 cron.initd 789e631207340e1879318ad377b9d74ad77978c5db8bcea1bb0a4871525d67a8e7 cron.initd
795e8f251a3698700bc3cc064dd3dc85f791c6a66d32d088e107de7ac71be70697 dnsd.initd 795e8f251a3698700bc3cc064dd3dc85f791c6a66d32d088e107de7ac71be70697 dnsd.initd
800f367092a4faebbfb06ba137ff9805678a5aa37743cebedd13846a9e39222d33 httpd.initd 8013d8c6c12fe8c3c01667e9c481f6dbc87d26190e03cb9ec991deccf78973c637 httpd.initd
81efd49fa6aed1f4a7fcbdbc66bc9bfa07be88df500c95d6ee2758d9f45e2bfd3c inetd.initd 81efd49fa6aed1f4a7fcbdbc66bc9bfa07be88df500c95d6ee2758d9f45e2bfd3c inetd.initd
82248b8a2e6fed69454146a89bb1fa8a1927a09c1f6d28965f4b9dcc4ac20513b3 klogd.initd 82248b8a2e6fed69454146a89bb1fa8a1927a09c1f6d28965f4b9dcc4ac20513b3 klogd.initd
832e926542fd4e0fb16e2655ddef0d0cd752178757eff4f19ad09714509e534951 mdev-mount.initd 832e926542fd4e0fb16e2655ddef0d0cd752178757eff4f19ad09714509e534951 mdev-mount.initd
@@ -100,7 +100,7 @@ b9129dd73ffa93f9a5fa85469b9ba144cc4948b02de0bea45eee0469176cc8f8 default.script
100sha512sums="bbd5cb45af37114a1d106e1dad6839e98c62714f94e44e480e46f7c806c6d6c434e7852980139222493fb74760f2815bbdc4bc97a683d1f3345315991056c8fa acpid.initd 100sha512sums="bbd5cb45af37114a1d106e1dad6839e98c62714f94e44e480e46f7c806c6d6c434e7852980139222493fb74760f2815bbdc4bc97a683d1f3345315991056c8fa acpid.initd
10144cacb40d7e732443a3bbc550b907858b404ddba928c7c30d22dfe672c36dd060b9ffa57b11584ece6a7fd5f01c056dd8b61862a2d4e0e7a47e4181784ee4af5 cron.initd 10144cacb40d7e732443a3bbc550b907858b404ddba928c7c30d22dfe672c36dd060b9ffa57b11584ece6a7fd5f01c056dd8b61862a2d4e0e7a47e4181784ee4af5 cron.initd
102900ca3d192b3edade80b9b8b660bfe2897522ef6f36c342ea16d6f21e6d2acc609d66fc7c77133b03239f19bee2a6227851bc75279ebcab561d6784e947b6328 dnsd.initd 102900ca3d192b3edade80b9b8b660bfe2897522ef6f36c342ea16d6f21e6d2acc609d66fc7c77133b03239f19bee2a6227851bc75279ebcab561d6784e947b6328 dnsd.initd
1036d9e980f3d04e0c860fdbd61e8943a07e66b14220a015bed20de59b9be40849490457f17b7e28030263c6c8609a3a440c526b1083a87d3c739ded3b11f3f81cc httpd.initd 1037837353fa1c131a1e1494758a28f59aab81eafb2d3c998857128c3f22e1548b7156924610a39e9734e1d49e9de291690ec3ec2a0a27f29e33380f9c37adc82de httpd.initd
104e5856b6d83047a84f9332a0634de5f165e65878138298a1c737b9326be5a206d24f43227a88b5644f07bdfc7b0974b4d92881bb6236079e9c6ea267e031f8164 inetd.initd 104e5856b6d83047a84f9332a0634de5f165e65878138298a1c737b9326be5a206d24f43227a88b5644f07bdfc7b0974b4d92881bb6236079e9c6ea267e031f8164 inetd.initd
1050466c53d6cfc62603e1b0c9c5b6551076d3a33ac138a2064339db9ebec2adafb62c4d7ccfb414e6d97260d4abd42efe7d6bda7dafe9ce55e944b10b7cde3d2ef klogd.initd 1050466c53d6cfc62603e1b0c9c5b6551076d3a33ac138a2064339db9ebec2adafb62c4d7ccfb414e6d97260d4abd42efe7d6bda7dafe9ce55e944b10b7cde3d2ef klogd.initd
1062d43f3d9fb48164b34daaa55e8f2936d6235dd14b1bb368b4bdc90bd870c595fce39accd981ecb23bacdaddf9fa2adbea4eb9ee7080e9dd2fff8e7636f5f9f16 mdev-mount.initd 1062d43f3d9fb48164b34daaa55e8f2936d6235dd14b1bb368b4bdc90bd870c595fce39accd981ecb23bacdaddf9fa2adbea4eb9ee7080e9dd2fff8e7636f5f9f16 mdev-mount.initd
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd
index 091207e47b..58840c5ae6 100644
--- a/main/busybox-initscripts/httpd.initd
+++ b/main/busybox-initscripts/httpd.initd
@@ -3,8 +3,6 @@
3name="busybox $SVCNAME" 3name="busybox $SVCNAME"
4command="/usr/sbin/$SVCNAME" 4command="/usr/sbin/$SVCNAME"
5command_args="$HTTPD_OPTS" 5command_args="$HTTPD_OPTS"
6pidfile="/var/run/$SVCNAME.pid"
7
8 6
9depend() { 7depend() {
10 need net localmount 8 need net localmount