Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (7805c18fa0663539b6dda66d259189ddd091d8eb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (7805c18fa0663539b6dda66d259189ddd091d8eb)
  • Date: Tue, 17 Feb 2009 07:33:46 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

ftp/proftpd/DETAILS | 4 ++--
ftp/proftpd/HISTORY | 6 ++++++
ftp/proftpd/PRE_BUILD | 5 -----
ftp/proftpd/libcap.patch | 12 ------------
ftp/proftpd/mod_t.patch | 35 -----------------------------------
5 files changed, 8 insertions(+), 54 deletions(-)

New commits:
commit 7805c18fa0663539b6dda66d259189ddd091d8eb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

proftpd: Updated to version 1.3.2. Removed unneeded
patches.

diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index f5699a5..06f52b7 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,6 +1,6 @@
SPELL=proftpd
- VERSION=1.3.1
-
SOURCE_HASH=sha512:014d99833a056f64632d952b2feb2aa2f6c5060ea44edf7bad92affc4023f38f5b10cea81845f22b37785b4155a608777d9ead836de8e64f1e14b017e38acc16
+ VERSION=1.3.2
+
SOURCE_HASH=sha512:072d2274d99b7834b9ac84456c0ad0ddd1b6498425993b17bf647716b8ef44fa4ef54c670dfd11624e0e859b4c46ba71c83d2a296c8e168cb6bde33fc10ed32d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 045ddd3..d836299 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,9 @@
+2009-02-17 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.2
+ * PRE_BUILD: Removed. Not needed
+ * mod_t.patch: Removed incorporated upstream
+ * libcap.patch: Removed. Fixed upstream. Compiles against current
libcap
+
2008-08-12 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added two patches: libcap.patch and mod_t.patch to fix
compilation issues with new kernel headers/libcap
diff --git a/ftp/proftpd/PRE_BUILD b/ftp/proftpd/PRE_BUILD
deleted file mode 100755
index a292b06..0000000
--- a/ftp/proftpd/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/mod_t.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/libcap.patch"
diff --git a/ftp/proftpd/libcap.patch b/ftp/proftpd/libcap.patch
deleted file mode 100644
index 3e2adf3..0000000
--- a/ftp/proftpd/libcap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/libcap/libcap.h 2008-04-24 19:46:29.475883739 +0200
-+++ lib/libcap/libcap.h 2008-04-24 19:48:31.116088563 +0200
-@@ -52,7 +52,8 @@
- */
-
- #if !defined(_LINUX_CAPABILITY_VERSION) || \
-- (_LINUX_CAPABILITY_VERSION != 0x19980330)
-+ ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
-+ (_LINUX_CAPABILITY_VERSION != 0x20071026))
-
- # error "Kernel <linux/capability.h> does not match library"
- # error "file "libcap.h" --> fix and recompile libcap"
diff --git a/ftp/proftpd/mod_t.patch b/ftp/proftpd/mod_t.patch
deleted file mode 100644
index 90931f9..0000000
--- a/ftp/proftpd/mod_t.patch
+++ /dev/null
@@ -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



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (7805c18fa0663539b6dda66d259189ddd091d8eb), George Sherwood, 02/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page