Skip to Content.
Sympa Menu

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

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 (1bfe191771643c784b2c1e7283c6107f82ca9741)
  • Date: Sun, 8 Jan 2017 19:59:05 +0000

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

ftp/vsftpd/DETAILS | 6 +++---
ftp/vsftpd/HISTORY | 8 ++++++++
ftp/vsftpd/PRE_BUILD | 19 ++++++++++++++++---
ftp/vsftpd/mk.diff | 9 ---------
4 files changed, 27 insertions(+), 15 deletions(-)

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

vsftpd 3.0.3

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

vsftpd: Simplify sed scripts in PRE_BUILD

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

vsftpd: Replace CFLAGS portion of mk.diff with a sed script

commit 2b0e31114d8f324fbba9ac8349836241567cf2ab
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vsftpd: Add missing preamble to PRE_BUILD

diff --git a/ftp/vsftpd/DETAILS b/ftp/vsftpd/DETAILS
index 5b649ce..0b7e550 100755
--- a/ftp/vsftpd/DETAILS
+++ b/ftp/vsftpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=vsftpd
- VERSION=2.3.4
+ VERSION=3.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://vsftpd.beasts.org/users/cevans/$SOURCE
-
SOURCE_HASH=sha512:031e7b93d8acde62595f005ec1329b0404a61b42bfada041417085da02e5d84474c1dc6a7766a52249261a221a96c3840db28c7bf3756f5beb9f6e804735a979
+ SOURCE_URL[0]=https://security.appspot.com/downloads/$SOURCE
+
SOURCE_HASH=sha512:5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
WEB_SITE=http://vsftpd.beasts.org/
ENTERED=20030107
LICENSE[0]="GPL"
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index c3b28ae..861c497 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,11 @@
+2017-01-08 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Added missing preamble
+ Simplified sed scripts
+ * PRE_BUILD, mk.diff: Replaced CFLAGS portion of the patch with a sed
+ script
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 3.0.3
+
2016-08-10 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, PRE_BUILD: Move patching instructions to PRE_BUILD
s/SCRIPT_DIRECTORY/SPELL_DIRECTORY/
diff --git a/ftp/vsftpd/PRE_BUILD b/ftp/vsftpd/PRE_BUILD
index 614c0f7..8dbe1a0 100755
--- a/ftp/vsftpd/PRE_BUILD
+++ b/ftp/vsftpd/PRE_BUILD
@@ -1,3 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
#
# We don't want to install into /usr/local, so
# we'll just copy the files correctly
@@ -5,21 +8,31 @@
patch -p0 < ${SPELL_DIRECTORY}/mk.diff &&

#
+# Fix CFLAGS
+#
+sedit '
+ /^CFLAGS[\t ]*=/!b
+ :C /\\$/ {N; b C}
+ s/=[\t ]*-O2/+=/
+ s/ -Werror / /
+' Makefile &&
+
+#
# 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
+ sedit "/^#undef VSF_BUILD_TCPWRAPPERS/{s/undef/define/}" builddefs.h
fi &&

if spell_ok openssl; then
- sedit "s:undef VSF_BUILD_SSL:define VSF_BUILD_SSL:" builddefs.h
+ sedit "/^#undef VSF_BUILD_SSL/{s/undef/define/}" 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
+ sedit "/^#define VSF_BUILD_PAM/{s/define/undef/}" builddefs.h
fi
diff --git a/ftp/vsftpd/mk.diff b/ftp/vsftpd/mk.diff
index d02617c..2a6aa6c 100644
--- a/ftp/vsftpd/mk.diff
+++ b/ftp/vsftpd/mk.diff
@@ -1,14 +1,5 @@
--- Makefile 2006-07-03 14:25:41.000000000 +0200
+++ Makefile.cp 2006-08-20 15:33:47.000000000 +0200
-@@ -3,7 +3,7 @@
- INSTALL = install
- IFLAGS = -idirafter dummyinc
- #CFLAGS = -g
--CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-+CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-
- LIBS = `./vsf_findlibs.sh`
- LINK = -Wl,-s
@@ -24,21 +24,11 @@
$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1bfe191771643c784b2c1e7283c6107f82ca9741), Ismael Luceno, 01/08/2017

Archive powered by MHonArc 2.6.24.

Top of Page