[arch-commits] Commit in proftpd/repos (3 files)

Hugo Doria hugo at archlinux.org
Sun Mar 22 00:23:46 UTC 2009


    Date: Saturday, March 21, 2009 @ 20:23:45
  Author: hugo
Revision: 30812

Merged revisions 30811 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/proftpd/trunk

........
  r30811 | hugo | 2009-03-21 21:23:28 -0300 (Sat, 21 Mar 2009) | 2 lines
  
  upgpkg: proftpd 1.3.2-3
      FS#8327 - proftpd.pid not in /var/run
........

Modified:
  proftpd/repos/testing-i686/	(properties)
  proftpd/repos/testing-i686/PKGBUILD
  proftpd/repos/testing-i686/proftpd

----------+
 PKGBUILD |   17 +++++++----------
 proftpd  |   11 +++++------
 2 files changed, 12 insertions(+), 16 deletions(-)


Property changes on: proftpd/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /proftpd/trunk:1-29913
   + /proftpd/trunk:1-30811

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-22 00:23:28 UTC (rev 30811)
+++ testing-i686/PKGBUILD	2009-03-22 00:23:45 UTC (rev 30812)
@@ -3,7 +3,7 @@
 
 pkgname=proftpd
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
@@ -11,20 +11,17 @@
 depends=('glibc' 'pam' 'ncurses' 'libcap>=2.16')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
 source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver.tar.bz2 proftpd \
-        proftpd.logrotate proftpd.conf.d \
-        mode_t.patch)
+        proftpd.logrotate proftpd.conf.d)
 md5sums=('89f5e31fc3d3e02b66424dfc6cc5892d'
-         '2ab07084433a57c994e65eabdf3971a9'
+         '99f6f9a989e70e3fa50809fc2bbbbb0a'
          'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736'
-         'abe1733dd7c43ea98534b32b98a8984a')
+         '71d5932b0461c318ed68c2c0c2660736')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-#  patch -Np0 -i ${srcdir}/mode_t.patch
-  ./configure --prefix=/usr --disable-pam \
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_file \
-    --sysconfdir=/etc --localstatedir=/var --enable-ctrls
+    --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls
   make || return 1
   make DESTDIR=$startdir/pkg install
   install -D -m644 ../proftpd.logrotate $startdir/pkg/etc/logrotate.d/proftpd
@@ -32,5 +29,5 @@
   install -D -m755 ../proftpd ${startdir}/pkg/etc/rc.d/proftpd
   cd $startdir/pkg/etc
   sed -i 's|nogroup|nobody|g' proftpd.conf
-  rm -r ${startdir}/pkg/usr/{libexec,share}
+  rmdir $startdir/pkg/usr/{libexec,share/locale}
 }

Modified: testing-i686/proftpd
===================================================================
--- testing-i686/proftpd	2009-03-22 00:23:28 UTC (rev 30811)
+++ testing-i686/proftpd	2009-03-22 00:23:45 UTC (rev 30812)
@@ -7,26 +7,24 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/proftpd`
 case "$1" in
   start)
     stat_busy "Starting ProFTPd Server"
-    [ -z "$PID" ] && /usr/sbin/proftpd ${PROFTPD_ARGS}
+    /usr/sbin/proftpd ${PROFTPD_ARGS}
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/proftpd.pid
       add_daemon proftpd
       stat_done
     fi
     ;;
   stop)
     stat_busy "Stopping ProFTPd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm /var/run/proftpd.pid
+      rm -f /var/run/proftpd.pid
       rm_daemon proftpd
       stat_done
     fi
@@ -37,6 +35,7 @@
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0
+




More information about the arch-commits mailing list