Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (4e9e2d8d94f7b9a90ce98ef248674e93d507475d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (4e9e2d8d94f7b9a90ce98ef248674e93d507475d)
  • Date: Sat, 2 Dec 2006 07:09:14 -0600

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

ftp/proftpd/BUILD | 16 ++++++++--------
ftp/proftpd/CONFIGURE | 14 +++++++-------
ftp/proftpd/DETAILS | 14 +++++++-------
ftp/proftpd/HISTORY | 3 +++
ftp/proftpd/PREPARE | 1 -
5 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 4e9e2d8d94f7b9a90ce98ef248674e93d507475d
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

proftpd: update to 1.3.0a

diff --git a/ftp/proftpd/BUILD b/ftp/proftpd/BUILD
index f230bf6..fc15a8b 100755
--- a/ftp/proftpd/BUILD
+++ b/ftp/proftpd/BUILD
@@ -1,11 +1,11 @@
-if [[ $PROFTPD_DEVEL == "n" ]]; then
- if [[ -z $PROFTPD_CAPS ]]; then
- CFLAGS=${CFLAGS/-fPIC} &&
- CFLAGS=${CFLAGS/-DPIC} &&
- CXXFLAGS=${CXXFLAGS/-fPIC} &&
- CXXFLAGS=${CXXFLAGS/-DPIC}
- fi
-fi &&
+#if [[ $PROFTPD_DEVEL == "n" ]]; then
+if [[ -z $PROFTPD_CAPS ]]; then
+ CFLAGS=${CFLAGS/-fPIC} &&
+ CFLAGS=${CFLAGS/-DPIC} &&
+ CXXFLAGS=${CXXFLAGS/-fPIC} &&
+ CXXFLAGS=${CXXFLAGS/-DPIC}
+fi
+#fi &&

sedit "s/ standalone/ inetd/" sample-configurations/basic.conf
&&

diff --git a/ftp/proftpd/CONFIGURE b/ftp/proftpd/CONFIGURE
index 413a44d..67b6db6 100755
--- a/ftp/proftpd/CONFIGURE
+++ b/ftp/proftpd/CONFIGURE
@@ -1,11 +1,11 @@
. $GRIMOIRE/FUNCTIONS &&
-if [[ $PROFTPD_DEVEL == "n" ]]; then
- if [[ $(get_sorcery_kernel_config CONFIG_SECURITY) != y ]]; then
- config_query_option PROFTPD_CAPS \
- "You don't have capabilities enabled in your kernel, do you still \
- want to build them?" n "" "--disable-cap"
- fi
-fi &&
+#if [[ $PROFTPD_DEVEL == "n" ]]; then
+if [[ $(get_sorcery_kernel_config CONFIG_SECURITY) != y ]]; then
+ config_query_option PROFTPD_CAPS \
+ "You don't have capabilities enabled in your kernel, do you still \
+ want to build them?" n "" "--disable-cap"
+fi
+#fi &&

config_query_option PROFTPD_IP6 "enable IPv6 support?" \
y "--enable-ipv6" "" &&
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 71189d0..77254e2 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,11 +1,11 @@
SPELL=proftpd
-if [ "$PROFTPD_DEVEL" == "y" ]; then
- VERSION=1.3.0
-
SOURCE_HASH=sha512:3002a8004689655cfbcb069387c06a2e528c8988d9469e8c0ad0db6bfbbf39db6f6f1b8248f078f627a392c31d41089aa833cd6d1c454af5340d96d44acf6b76
-else
- VERSION=1.3.0
-
SOURCE_HASH=sha512:3002a8004689655cfbcb069387c06a2e528c8988d9469e8c0ad0db6bfbbf39db6f6f1b8248f078f627a392c31d41089aa833cd6d1c454af5340d96d44acf6b76
-fi
+#if [ "$PROFTPD_DEVEL" == "y" ]; then
+# VERSION=1.3.0
+#
SOURCE_HASH=sha512:3002a8004689655cfbcb069387c06a2e528c8988d9469e8c0ad0db6bfbbf39db6f6f1b8248f078f627a392c31d41089aa833cd6d1c454af5340d96d44acf6b76
+#else
+ VERSION=1.3.0a
+
SOURCE_HASH=sha512:a23697a6ea304c09b1f14382bc82e2838394b646695d02f4510420e55612cf1a57f38a19938dd768073099c7c1aad66123913b426213db6b3d088613986602cc
+#fi
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 042227c..df13d4a 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2006-12-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * DETAILS, CONFIGURE, BUILD, rm PREPARE: update to 1.3.0a
+
2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
* TRIGGERS: Rewritten to use is_depends_enabled, sources
is_depends_enabled.function (remove it when is_depends_enabled
diff --git a/ftp/proftpd/PREPARE b/ftp/proftpd/PREPARE
deleted file mode 100755
index 867bcf9..0000000
--- a/ftp/proftpd/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query PROFTPD_DEVEL "Build the devel version?" n



  • [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (4e9e2d8d94f7b9a90ce98ef248674e93d507475d), Mathieu Lonjaret, 12/02/2006

Archive powered by MHonArc 2.6.24.

Top of Page