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

[Andrea Scarpino]

    Date: Tuesday, January 26, 2010 @ 09:15:34
  Author: andrea
Revision: 65281

Merged revisions 60738,65280 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/proftpd/trunk

........
  r60738 | paul | 2009-12-06 18:32:08 +0100 (Sun, 06 Dec 2009) | 2 lines
  
  upgpkg: proftpd 1.3.2b-2
      enabled ipv6, fixing FS#14643
........
  r65280 | andrea | 2010-01-26 15:14:46 +0100 (Tue, 26 Jan 2010) | 2 lines
  
  upgpkg: proftpd 1.3.2c-1
      upstream release
........

Modified:
  proftpd/repos/extra-i686/	(properties)
  proftpd/repos/extra-i686/PKGBUILD
Deleted:
  proftpd/repos/extra-i686/mode_t.patch

--------------+
 PKGBUILD     |   18 +++++++++++-------
 mode_t.patch |   35 -----------------------------------
 2 files changed, 11 insertions(+), 42 deletions(-)


Property changes on: proftpd/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /proftpd/trunk:1-60288
   + /proftpd/trunk:1-65280

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-01-26 14:14:46 UTC (rev 65280)
+++ extra-i686/PKGBUILD	2010-01-26 14:15:34 UTC (rev 65281)
@@ -1,18 +1,21 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Maintainer:
+# Contributor: Eric Belanger <eric at archlinux.org>
 
 pkgname=proftpd
-pkgver=1.3.2b
+pkgver=1.3.2c
 pkgrel=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64')
 url="http://www.proftpd.org"
 license=('GPL')
-depends=('glibc' 'pam' 'ncurses' 'libcap>=2.16')
+depends=('glibc' 'pam' 'ncurses' 'libcap')
 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)
-md5sums=('0d6777839f37115654ce384841f68131'
+source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver.tar.bz2
+	'proftpd'
+        'proftpd.logrotate'
+	'proftpd.conf.d')
+md5sums=('559fd3fb6959d42ddd66b333a03b0c49'
          '99f6f9a989e70e3fa50809fc2bbbbb0a'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736')
@@ -21,7 +24,8 @@
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --mandir=/usr/share/man --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_file:mod_tls \
-    --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls
+    --sysconfdir=/etc --localstatedir=/var/run --enable-ctrls \
+    --enable-ipv6
   make || return 1
   make DESTDIR="$pkgdir" install
   install -D -m644 ../proftpd.logrotate "$pkgdir"/etc/logrotate.d/proftpd

Deleted: extra-i686/mode_t.patch
===================================================================
--- extra-i686/mode_t.patch	2010-01-26 14:14:46 UTC (rev 65280)
+++ extra-i686/mode_t.patch	2010-01-26 14:15:34 UTC (rev 65281)
@@ -1,35 +0,0 @@
---- acconfig.h	2002/12/15 18:05:09	1.15
-+++ acconfig.h	2007/10/15 17:27:25	1.16
-@@ -12,9 +12,6 @@
- /* Define to `int' if <sys/types.h> doesn't define. */
- #undef ino_t
- 
--/* Define to `mode_t' if <sys/types.h> doesn't define. */
--#undef umode_t
--
- /* Define to `int' if <sys/socket.h> doesn't define. */
- #undef socklen_t
- 
---- config.h.in	2007/10/13 03:05:27	1.118
-+++ config.h.in	2007/10/15 17:27:25	1.119
-@@ -37,9 +37,6 @@
- /* Define to `int' if <sys/socket.h> doesn't define. */
- #undef socklen_t
- 
--/* Define to `mode_t' if <sys/types.h> doesn't define. */
--#undef umode_t
--
- /* Define if you have AIX send_file() semantics. */
- #undef HAVE_AIX_SENDFILE
- 
---- configure.in	2007/10/13 03:05:27	1.261
-+++ configure.in	2007/10/15 17:27:25	1.262
-@@ -1119,7 +1119,7 @@
- AC_CHECK_SIZEOF(time_t, 0)
- 
- dnl Check for generic typedefs
--AC_CHECK_TYPE(umode_t, mode_t)
-+AC_CHECK_TYPE(mode_t, mode_t)
- AC_CHECK_TYPE(ino_t, ino_t)
- AC_CHECK_TYPE(intptr_t, AC_DEFINE(HAVE_INTPTR_T),, [
-   #if HAVE_INTTYPES_H