net-ftp/vsftpd-devnet: Changing default background state and reverting to portage...

svn path=/sunrise/; revision=8298

diff --git a/net-ftp/vsftpd-devnet/ChangeLog b/net-ftp/vsftpd-devnet/ChangeLog
index 8183049f9c2dbbd041bb3a538165be7999359dca..794afb61e67e5f3af5f5a2f8ff4420574f0b986e 100644 (file)
--- a/net-ftp/vsftpd-devnet/ChangeLog
+++ b/net-ftp/vsftpd-devnet/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Apr 2009; KostyaSha (integer) <gentoo.integer@gmail.com>
+  vsftpd-devnet-2.1.0_p1.ebuild, files/vsftpd-devnet-2.1.0-gentoo.patch,
+  files/vsftpd.init:
+  Changing default background state and reverting to portage init script due
+  comments on bug 261730
+
   11 Mar 2009; KostyaSha (integer) <gentoo.integer@gmail.com>
   +vsftpd-devnet-2.1.0_p1.ebuild,
   +files/vsftpd-devnet-2.1.0-dont-link-caps.patch,

diff --git a/net-ftp/vsftpd-devnet/Manifest b/net-ftp/vsftpd-devnet/Manifest
index 3a62068cd5efa7e9159bcee17895e8f3f06caa7d..1c26d5b1273302d11077fb6dd3e0d278963930b9 100644 (file)
--- a/net-ftp/vsftpd-devnet/Manifest
+++ b/net-ftp/vsftpd-devnet/Manifest
@@ -1,10 +1,10 @@
 AUX vsftpd-devnet-2.1.0-dont-link-caps.patch 1087 RMD160 28fa4a1404132fddc01d7ff639966832a1d47848 SHA1 a36b97670b319b80b0bb25ec4e8aec2775b1c1ce SHA256 c104226c9cdf1c7aaa2beeafff1aca0f3433ffee6961f6d1ecbd76880640c300
-AUX vsftpd-devnet-2.1.0-gentoo.patch 2923 RMD160 e7d5c267b9ca7f2e5ba9b8ca06cbf319d0cd08e5 SHA1 63f50dce2ea37b0498f856ed5270a781b5357fcd SHA256 023a7e8dc4054d8d9deb3d9fdacfdd910382e17db58b835812a9ff9c443e10ed
+AUX vsftpd-devnet-2.1.0-gentoo.patch 3175 RMD160 479c816957c145aa280b6a53646de7328d4a714e SHA1 1b75f7cb4853601e0441c841f172563bfc5f1847 SHA256 c28fa633410f548ec710518699f38d8b510f2ff625179ceca5919e0a75d97036
 AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
-AUX vsftpd.init 1697 RMD160 e47c619663a6163ee2468993b31e73596cc52d72 SHA1 e14c50d615f7590e775456231faf08310201cee7 SHA256 24b98ee227b0ae9b7c52ab6136fd39681baac157fef5ec637c0733c4aba8c880
+AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
 DIST vsftpd-2.1.0-ext1.tar.gz 199926 RMD160 840d955cc4234c1b28ce300d3f018c47143a999b SHA1 0c67a2c696905da393e0412f85aee4d9e4623182 SHA256 fd137f98a67705c6cdce733c23bc7ebab14664b904b9b0f8b13669739c1d8a88
-EBUILD vsftpd-devnet-2.1.0_p1.ebuild 2792 RMD160 0f6fbd0bfaed869d3f4921da1d364fa6d77522c0 SHA1 9e24a900c36c50b1cc84c55dbe22f96d730f0e6b SHA256 02f201818f58db83cd269b8435b06c37e936ebd16b9376662d8a672128715642
-MISC ChangeLog 461 RMD160 cd537628abee4931097564c14a93e87b2f3b5e95 SHA1 6178687b0969ec17b30250e75fb17990481f9216 SHA256 50a395f538ff3b0480dad01a9810a09fdb02b31a7cf6ce9130cbd05a33fdaf51
+EBUILD vsftpd-devnet-2.1.0_p1.ebuild 2882 RMD160 a5dfa8f13bed55e3af53f6029c04b822eb2ac1ea SHA1 75d21ab20c9ff7a33c33e335317ed2aa035bc6bd SHA256 ba51070558a0ca37a3f183cee496b3a64c4eac9a8ee6321cba9e8edf2aa27447
+MISC ChangeLog 720 RMD160 16c799cad8f73241473115386d0b73e194e5e70c SHA1 6888517d7a2a799ebb7f3c51d74ae6ad0f1a3fc0 SHA256 968583eea7e9b39057727cc3bbaca80f6e5698886b37f4ddb81b730321e505f8
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-gentoo.patch b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-gentoo.patch
index 70aa7cd23d3ce3b20d6f8814fd9cd3c67ac4ac59..ac9065f08fdc61207597d6a062743634e4d1d9de 100644 (file)
--- a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-gentoo.patch
+++ b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-gentoo.patch
@@ -55,6 +55,15 @@ diff -ur vsftpd-2.1.0.orig/vsftpd.conf  vsftpd-2.1.0/vsftpd.conf
 diff -ur  vsftpd-2.1.0.orig/vsftpd.conf.5  vsftpd-2.1.0/vsftpd.conf.5
 --- vsftpd.conf.5.orig 2009-02-28 22:36:14.000000000 +0200
 +++ vsftpd.conf.5      2009-02-28 22:40:00.000000000 +0200
+@@ -150,7 +150,7 @@
+ the listener process. i.e. control will immediately be returned to the shell
+ which launched vsftpd.
+
+-Default: YES
++Default: NO
+ .TP
+ .B check_shell
+ Note! This option only has an effect for non-PAM builds of vsftpd. If disabled,
 @@ -1141,10 +1141,10 @@
  with an example. If you set
  .BR user_config_dir

diff --git a/net-ftp/vsftpd-devnet/files/vsftpd.init b/net-ftp/vsftpd-devnet/files/vsftpd.init
index 58b7dc434d4acd5fc5a09e5329cc5fb002f393c1..e486e1fc08637e6cc4d4f54b2423faea3a41d159 100644 (file)
--- a/net-ftp/vsftpd-devnet/files/vsftpd.init
+++ b/net-ftp/vsftpd-devnet/files/vsftpd.init
@@ -50,13 +50,19 @@ start() {
        checkconfig || return 1
        ebegin "Starting ${SVCNAME}"
        start-stop-daemon --start --exec ${VSFTPD_EXEC} \
-               --background -- "${VSFTPD_CONF}"
+               --background --make-pidfile --pidfile "${VSFTPD_PID}" \
+               -- "${VSFTPD_CONF}"
        eend $?
 }
 
 stop() {
        ebegin "Stopping ${SVCNAME}"
-       start-stop-daemon --stop --name ${SVCNAME} 
+       if [ -f ${VSFTPD_PID} ]; then
+               start-stop-daemon --stop --pidfile ${VSFTPD_PID} 
+       else
+               ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the process name ${SVCNAME}"
+               start-stop-daemon --stop --name ${SVCNAME}
+       fi
        eend $?
 }
 

diff --git a/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.0_p1.ebuild b/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.0_p1.ebuild
index 2469e73f8baf8566901d37405e28effb0b7de23a..75d68b85bbfa6262761a6d6c48b6492fc6b70f7b 100644 (file)
--- a/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.0_p1.ebuild
+++ b/net-ftp/vsftpd-devnet/vsftpd-devnet-2.1.0_p1.ebuild
@@ -45,6 +45,8 @@ src_unpack() {
 
        # Let portage control stripping
        sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+       # disabling background by default 
+       sed -i 's/background = 1/background = 0/' tunables.c
 }
 
 src_compile() {