Skip to Content.
Sympa Menu

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

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 (128417768660c86387de342a1d1af78b0e389ae3)
  • Date: Mon, 23 Feb 2009 07:33:12 -0600

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

ftp/vsftpd/14863.diff | 20 --------------------
ftp/vsftpd/BUILD | 3 ---
ftp/vsftpd/DETAILS | 4 ++--
ftp/vsftpd/HISTORY | 6 ++++++
4 files changed, 8 insertions(+), 25 deletions(-)

New commits:
commit 128417768660c86387de342a1d1af78b0e389ae3
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

vsftpd: Updated to version 2.1.0. Removed patch 14863.diff. Builds
with no errors here.

diff --git a/ftp/vsftpd/14863.diff b/ftp/vsftpd/14863.diff
deleted file mode 100644
index b2be772..0000000
--- a/ftp/vsftpd/14863.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysutil.c~ 2006-09-06 13:29:46.677233758 +0200
-+++ sysutil.c 2006-09-06 13:30:43.824611192 +0200
-@@ -601,7 +601,7 @@
- vsf_sysutil_wait_exited_normally(
- const struct vsf_sysutil_wait_retval* p_waitret)
- {
-- return WIFEXITED(p_waitret->exit_status);
-+ return WIFEXITED((struct vsf_sysutil_wait_retval
*)p_waitret->exit_status);
- }
-
- int
-@@ -611,7 +611,7 @@
- {
- bug("not a normal exit in vsf_sysutil_wait_get_exitcode");
- }
-- return WEXITSTATUS(p_waitret->exit_status);
-+ return WEXITSTATUS((struct vsf_sysutil_wait_retval
*)p_waitret->exit_status);
- }
-
-
diff --git a/ftp/vsftpd/BUILD b/ftp/vsftpd/BUILD
index b070d3a..a971901 100755
--- a/ftp/vsftpd/BUILD
+++ b/ftp/vsftpd/BUILD
@@ -1,6 +1,3 @@
-# fixes bug 14863
-patch -p0 < ${SCRIPT_DIRECTORY}/14863.diff &&
-
#
# We don't want to install into /usr/local, so
# we'll just copy the files correctly
diff --git a/ftp/vsftpd/DETAILS b/ftp/vsftpd/DETAILS
index d56a2c2..c9d053d 100755
--- a/ftp/vsftpd/DETAILS
+++ b/ftp/vsftpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=vsftpd
- VERSION=2.0.7
+ VERSION=2.1.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://vsftpd.beasts.org/users/cevans/$SOURCE
-
SOURCE_HASH=sha512:53a8f16cf2081db8029b1667d0129e2af49b9d966cdaf53960efec85052305cc66fa3b36850e11ef2cecacee593a0e41a00fd4ae662fe5fa61072bb1f5f380e1
+
SOURCE_HASH=sha512:6e82f4594da0f958d7b1b081f41ef0487eafb2a3446e972cb026d4bdc85b64fd8b67bc5c98afadb4a704afacfa177aa88166acab2a7fdab5aa6ad9d2b9357bf1
WEB_SITE=http://vsftpd.beasts.org/
ENTERED=20030107
LICENSE[0]="GPL"
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index 1379705..32f0812 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,9 @@
+2009-02-23 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.1.0
+ * BUILD: Removed 14863.diff
+ * 14863.diff: Removed broke patch. Builds fine here with gcc 4.3.2
+ If there are still issues will need to find new patch.
+
2008-11-25 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* BUILD, 14863.diff: patch to fix bug 14863




  • [SM-Commit] GIT changes to master grimoire by George Sherwood (128417768660c86387de342a1d1af78b0e389ae3), George Sherwood, 02/23/2009

Archive powered by MHonArc 2.6.24.

Top of Page