Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c79ff0367e94ce1a223144ddce24df437cd553da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c79ff0367e94ce1a223144ddce24df437cd553da)
  • Date: Thu, 11 Aug 2016 03:06:59 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ftp/vsftpd/BUILD | 27 ---------------------------
ftp/vsftpd/HISTORY | 5 +++++
ftp/vsftpd/INSTALL | 16 +++-------------
ftp/vsftpd/PRE_BUILD | 25 +++++++++++++++++++++++++
ftp/vsftpd/vsftpd.conf | 1 +
5 files changed, 34 insertions(+), 40 deletions(-)

New commits:
commit c79ff0367e94ce1a223144ddce24df437cd553da
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vsftpd: Remove unnecessary code in INSTALL

commit 5ad8ea5315f19006415e8835206973fbcf12288c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vsftpd: s/SCRIPT_DIRECTORY/SPELL_DIRECTORY/

commit 6627eddb680a5fbd4b2fcc5ce6e428dae27d58eb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vsftpd: Move patching instructions to PRE_BUILD

diff --git a/ftp/vsftpd/BUILD b/ftp/vsftpd/BUILD
index a971901..8f58e6d 100755
--- a/ftp/vsftpd/BUILD
+++ b/ftp/vsftpd/BUILD
@@ -1,28 +1 @@
-#
-# We don't want to install into /usr/local, so
-# we'll just copy the files correctly
-#
-patch -p0 < ${SCRIPT_DIRECTORY}/mk.diff &&
-
-#
-# Should be made to allow someone to say "n" even if
-# the package is installed, but this is the easy way
-# I'm doing it for now. :)
-#
-if spell_ok tcp_wrappers; then
- sedit "s:undef VSF_BUILD_TCPWRAPPERS:define VSF_BUILD_TCPWRAPPERS:"
builddefs.h
-fi &&
-
-if spell_ok openssl; then
- sedit "s:undef VSF_BUILD_SSL:define VSF_BUILD_SSL:" builddefs.h
-fi &&
-
-#
-# builddefs.h defaults to using Linux-PAM
-#
-if ! spell_ok linux-pam; then
- sedit "s:define VSF_BUILD_PAM:undef VSF_BUILD_PAM:" builddefs.h
-fi &&
-
make
-
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index 3a3228d..c3b28ae 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,8 @@
+2016-08-10 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, PRE_BUILD: Move patching instructions to PRE_BUILD
+ s/SCRIPT_DIRECTORY/SPELL_DIRECTORY/
+ * INSTALL, vsftpd.conf: Remove unnecessary code
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/ftp/vsftpd/INSTALL b/ftp/vsftpd/INSTALL
index 18b0aee..48660fb 100755
--- a/ftp/vsftpd/INSTALL
+++ b/ftp/vsftpd/INSTALL
@@ -1,22 +1,12 @@
make install &&

if [ ! -e /etc/vsftpd.conf ]; then
- cp ${SPELL_DIRECTORY}/vsftpd.conf /etc &&
- echo "secure_chroot_dir=/var/empty" >> /etc/vsftpd.conf
+ cp "$SPELL_DIRECTORY"/vsftpd.conf /etc
fi &&

#to use in standalone mode. (!could break if those vars are renamed!)
if list_find "$INIT_INSTALLED" "vsftpd" ; then
- if list_find "$INIT_ENABLED" "vsftpd" ; then
- sedit '1i #standalone mode (init.d) \nlisten=YES' \
- /etc/vsftpd.conf
- else
- sedit '1i #standalone mode (init.d) \n#listen=YES' \
- /etc/vsftpd.conf
- fi
+ sedit '1i #standalone mode (init.d) \nlisten=YES' /etc/vsftpd.conf
fi &&

-if [ ! -d /var/empty ]; then
- mkdir /var/empty
-fi
-
+mkdir -p /var/empty
diff --git a/ftp/vsftpd/PRE_BUILD b/ftp/vsftpd/PRE_BUILD
new file mode 100755
index 0000000..614c0f7
--- /dev/null
+++ b/ftp/vsftpd/PRE_BUILD
@@ -0,0 +1,25 @@
+#
+# We don't want to install into /usr/local, so
+# we'll just copy the files correctly
+#
+patch -p0 < ${SPELL_DIRECTORY}/mk.diff &&
+
+#
+# Should be made to allow someone to say "n" even if
+# the package is installed, but this is the easy way
+# I'm doing it for now. :)
+#
+if spell_ok tcp_wrappers; then
+ sedit "s:undef VSF_BUILD_TCPWRAPPERS:define VSF_BUILD_TCPWRAPPERS:"
builddefs.h
+fi &&
+
+if spell_ok openssl; then
+ sedit "s:undef VSF_BUILD_SSL:define VSF_BUILD_SSL:" builddefs.h
+fi &&
+
+#
+# builddefs.h defaults to using Linux-PAM
+#
+if ! spell_ok linux-pam; then
+ sedit "s:define VSF_BUILD_PAM:undef VSF_BUILD_PAM:" builddefs.h
+fi
diff --git a/ftp/vsftpd/vsftpd.conf b/ftp/vsftpd/vsftpd.conf
index e2da6ec..6fcd5f4 100644
--- a/ftp/vsftpd/vsftpd.conf
+++ b/ftp/vsftpd/vsftpd.conf
@@ -24,3 +24,4 @@ data_connection_timeout=300
accept_timeout=60
connect_timeout=60
anon_max_rate=50000
+secure_chroot_dir=/var/empty



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c79ff0367e94ce1a223144ddce24df437cd553da), Ismael Luceno, 08/10/2016

Archive powered by MHonArc 2.6.24.

Top of Page