summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2010-11-04 19:52:19 +0000
committerMartin Matuska <mm@FreeBSD.org>2010-11-04 19:52:19 +0000
commit9d532666e152926033e99c9e66d9509c978c4bc5 (patch)
treea6fb4373617fd6d678e18d332854eff98d4ca8ec /ftp
parentConnect opengfx, openmsx and opensfx (diff)
- Update to 1.3.3c
- Update mod_sql_tds to 4.12 [1] PR: ports/151943 [1] Submitted by: Patrick Muldoon <doon@inoc.net>
Notes
Notes: svn path=/head/; revision=264094
Diffstat (limited to 'ftp')
-rw-r--r--ftp/proftpd/Makefile7
-rw-r--r--ftp/proftpd/distinfo14
-rw-r--r--ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c11
3 files changed, 7 insertions, 25 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 2613eb9cabb2..1816dee121a5 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= proftpd
-PORTVERSION= 1.3.3b
+PORTVERSION= 1.3.3c
CATEGORIES?= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -246,9 +246,8 @@ CONFIGURE_ARGS+=LIBS=-liodbc LD_LIBRARY_PATH=${LOCALBASE}/lib LDFLAGS=-L${LOCALB
.endif
.if defined(WITH_TDS)
-DISTFILES+= mod_sql_tds-4.11.tar.bz2:sql_tds
-EXTRACT_ONLY+= mod_sql_tds-4.11.tar.bz2
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-contrib-mod_sql_tds.c
+DISTFILES+= mod_sql_tds-4.12.tar.bz2:sql_tds
+EXTRACT_ONLY+= mod_sql_tds-4.12.tar.bz2
MODULES:=${MODULES}:mod_sql_tds
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 31238ab1e6b6..82a40f264e9d 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,12 +1,6 @@
-MD5 (proftpd-1.3.3b.tar.bz2) = 721b8232fcac36317a6a1d29fa86250e
-SHA256 (proftpd-1.3.3b.tar.bz2) = 28d235cf312df19d03762ef106ba9371741646f0fc36127db0482a8861d46794
-SIZE (proftpd-1.3.3b.tar.bz2) = 4162969
-MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21
+SHA256 (proftpd-1.3.3c.tar.bz2) = ea7f02e21f81e6ce79ebde8bbbd334bd269a039ac9137196a35309f791b24db1
+SIZE (proftpd-1.3.3c.tar.bz2) = 4166609
+SHA256 (mod_sql_tds-4.12.tar.bz2) = 81a2cc90df5f5323033f63b9a82eb96c26d9a9f999ffeffd999a0f9d2d22619f
+SIZE (mod_sql_tds-4.12.tar.bz2) = 11255
SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
SIZE (mod_clamav-0.11rc.tar.gz) = 5115
-MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
-SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
-SIZE (mod_digest.c) = 39073
-MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d
-SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff00a3f355ad50437f1ecff
-SIZE (mod_sql_tds-4.11.tar.bz2) = 11254
diff --git a/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c b/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c
deleted file mode 100644
index e0339640d096..000000000000
--- a/ftp/proftpd/files/extra-patch-contrib-mod_sql_tds.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/mod_sql_tds.c.orig 2010-03-24 09:52:43.325690672 +0100
-+++ contrib/mod_sql_tds.c 2010-03-24 09:53:04.995963774 +0100
-@@ -567,7 +567,7 @@
- sql_log(DEBUG_WARN, "%s", "No Host Specified! \t Checking Enviroment Variable");
- server = getenv("DSQUERY");
- if(server == NULL){
-- log_pri(PR_LOG_ERR, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! "
-+ pr_log_pri(PR_LOG_ERR, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! "
- "-- Shutting down!.");
- sql_log(DEBUG_WARN, "%s", "NO Host Specified and DSQUERY Enviroment Variable NOT Found! "
- "-- Shutting down!.");