Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6aeabff9a01bf906bf2297d969b8cc5ed2c02269)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6aeabff9a01bf906bf2297d969b8cc5ed2c02269)
  • Date: Tue, 12 Aug 2008 07:31:46 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ftp/proftpd/DEPENDS | 18 +++++++++---------
ftp/proftpd/DETAILS | 16 +++++++---------
ftp/proftpd/HISTORY | 7 ++++++-
ftp/proftpd/PRE_BUILD | 5 +++++
ftp/proftpd/libcap.patch | 12 ++++++++++++
ftp/proftpd/mod_t.patch | 35 +++++++++++++++++++++++++++++++++++
6 files changed, 74 insertions(+), 19 deletions(-)

New commits:
commit 6aeabff9a01bf906bf2297d969b8cc5ed2c02269
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

proftpd: added some patches to fix compilation issues + cleaned up

diff --git a/ftp/proftpd/DEPENDS b/ftp/proftpd/DEPENDS
index d3df409..f55d500 100755
--- a/ftp/proftpd/DEPENDS
+++ b/ftp/proftpd/DEPENDS
@@ -1,24 +1,24 @@
if [[ "x`echo $PROFTPD_MODS | grep tls`" != "x" ]]; then
depends openssl
-fi &&
+fi &&

if [[ "x`echo $PROFTPD_MODS | grep wrap`" != "x" ]]; then
depends tcp_wrappers
-fi &&
+fi &&

if [[ "x`echo $PROFTPD_MODS | grep mysql`" != "x" ]]; then
depends mysql
-fi &&
+fi &&

if [[ "x`echo $PROFTPD_MODS | grep postgresql`" != "x" ]]; then
depends postgresql
-fi &&
+fi &&

if [[ "x`echo $PROFTPD_MODS | grep ldap`" != "x" ]]; then
depends openldap
-fi &&
-
-optional_depends "linux-pam" "--enable-auth-pam" \
-"--disable-auth-pam" "for security"
-
+fi &&

+optional_depends linux-pam \
+ "--enable-auth-pam" \
+ "--disable-auth-pam" \
+ "for Linux-PAM support"
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index d53657f..0a6c3fe 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -2,19 +2,17 @@
VERSION=1.3.1

SOURCE_HASH=sha512:014d99833a056f64632d952b2feb2aa2f6c5060ea44edf7bad92affc4023f38f5b10cea81845f22b37785b4155a608777d9ead836de8e64f1e14b017e38acc16
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
WEB_SITE=http://www.proftpd.org/
ENTERED=20011112
LICENSE[0]=GPL
KEYWORDS="ftp"
- SHORT="proftpd is a ftp server"
+ SHORT="highly configurable FTP server software"
cat << EOF
-ProFTPD is a proven, high-performance, scalable FTP server written
-from scratch, with a focus toward simplicity, security, and ease of
-configuration. Naturally, ProFTPD powers some of the largest sites on
-the Internet. It features a very Apache-like configuration syntax,
-modules, and a highly customizable server infrastructure, including
-support for multiple 'virtual' FTP servers, anonymous FTP, and
-permission-based directory visibility.
+ProFTPD is a proven, high-performance, scalable FTP server written from
scratch, with a focus toward simplicity, security, and ease of
+configuration. Naturally, ProFTPD powers some of the largest sites on the
+Internet. It features a very Apache-like configuration syntax, modules, and a
+highly customizable server infrastructure, including support for multiple
+'virtual' FTP servers, anonymous FTP, and permission-based directory
visibility.
EOF
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index cd8a183..045ddd3 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,9 @@
+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
+ * DETAILS: fixed descs, quoting the paths!
+ * DEPENDS: cleaned up
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* TRIGGERS: removed is_depends_enabled.function reference

@@ -140,4 +146,3 @@

2002-03-13 Eric Schabell <eric AT schabell.com>
* Added this History file.
-
diff --git a/ftp/proftpd/PRE_BUILD b/ftp/proftpd/PRE_BUILD
new file mode 100755
index 0000000..a292b06
--- /dev/null
+++ b/ftp/proftpd/PRE_BUILD
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..3e2adf3
--- /dev/null
+++ b/ftp/proftpd/libcap.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 0000000..90931f9
--- /dev/null
+++ b/ftp/proftpd/mod_t.patch
@@ -0,0 +1,35 @@
+--- 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 Vlad Glagolev (6aeabff9a01bf906bf2297d969b8cc5ed2c02269), Vlad Glagolev, 08/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page