aboutsummaryrefslogtreecommitdiffstats
path: root/ftp
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-03-13 02:06:24 +0800
committerobrien <obrien@FreeBSD.org>2003-03-13 02:06:24 +0800
commitde9a937f83b2fe666cf3e491785d80ab6ce1cf7c (patch)
treea29e07c7f9db3eaafab8d18d525c3281f8e324f8 /ftp
parent1d26aafa37e09ec5d4d9562be3bb9eef93b883ad (diff)
downloadfreebsd-ports-gnome-de9a937f83b2fe666cf3e491785d80ab6ce1cf7c.tar.gz
freebsd-ports-gnome-de9a937f83b2fe666cf3e491785d80ab6ce1cf7c.tar.zst
freebsd-ports-gnome-de9a937f83b2fe666cf3e491785d80ab6ce1cf7c.zip
Update to 3.1.5.
This update addresses http://www.kb.cert.org/vuls/id/JPLA-5GJUBZ http://www.ncftpd.com/ncftp/doc/changelog.html#3.1.5 PR: 47445 Submitted by: Esa Karkkainen <ejk@iki.fi>, ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
Diffstat (limited to 'ftp')
-rw-r--r--ftp/ncftp3/Makefile6
-rw-r--r--ftp/ncftp3/distinfo4
-rw-r--r--ftp/ncftp3/files/patch-af10
-rw-r--r--ftp/ncftp3/files/patch-sio-Makefile.in30
4 files changed, 16 insertions, 34 deletions
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 4834df4dfb5f..17b2262f32ff 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -7,14 +7,14 @@
#
PORTNAME= ncftp
-PORTVERSION= 3.1.4
-PORTREVISION= 1
+PORTVERSION= 3.1.5
+PORTREVISION= 0
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
DISTNAME= ncftp-${PORTVERSION}-src
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= ncftp-314-v6-20020709.diff.gz
+PATCHFILES= ncftp-315-v6-20030112.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= obrien@FreeBSD.org
diff --git a/ftp/ncftp3/distinfo b/ftp/ncftp3/distinfo
index 9b3d5c1b03ee..fea1f53bba65 100644
--- a/ftp/ncftp3/distinfo
+++ b/ftp/ncftp3/distinfo
@@ -1,2 +1,2 @@
-MD5 (ncftp-3.1.4-src.tar.bz2) = 605e735209ab30d0f129d079c06705e4
-MD5 (ncftp-314-v6-20020709.diff.gz) = 6b1fa736b9b60bff919be4a2a3419cde
+MD5 (ncftp-3.1.5-src.tar.bz2) = 686ee315742a34bd4132f0d077d2c172
+MD5 (ncftp-315-v6-20030112.diff.gz) = eadf43435b928a4650d54efb319dd845
diff --git a/ftp/ncftp3/files/patch-af b/ftp/ncftp3/files/patch-af
index 0cfaf41463d2..eef95b492156 100644
--- a/ftp/ncftp3/files/patch-af
+++ b/ftp/ncftp3/files/patch-af
@@ -1,11 +1,9 @@
---- Strn/Makefile.in.orig Mon Jan 10 14:37:45 2000
-+++ Strn/Makefile.in Mon Jan 10 14:38:32 2000
-@@ -42,7 +42,7 @@
-
+--- Strn/Makefile.in.orig Sat Oct 12 17:01:11 2002
++++ Strn/Makefile.in Wed Mar 12 10:00:33 2003
+@@ -63,5 +63,5 @@
$(LIBSO): $(SOBJS)
- /bin/rm -f "$(LIBSO)"
+ /bin/rm -f "$(LIBSO)" "$(LIBSOS)"
- gcc -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
+ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
/bin/ln -s "$(LIBSO)" "$(LIBSOS)"
-@/bin/ls -l "$(LIBSOS)" "$(LIBSO)"
-
diff --git a/ftp/ncftp3/files/patch-sio-Makefile.in b/ftp/ncftp3/files/patch-sio-Makefile.in
index 1485fd3efdff..8517e610b939 100644
--- a/ftp/ncftp3/files/patch-sio-Makefile.in
+++ b/ftp/ncftp3/files/patch-sio-Makefile.in
@@ -1,26 +1,10 @@
---- sio/Makefile.in.orig Fri Jun 28 03:09:26 2002
-+++ sio/Makefile.in Fri Jul 5 11:26:55 2002
-@@ -64,15 +64,19 @@
- chmod a+r $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
- -@/bin/ls -l $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
-
-+dynamic: $(LIBSO)
-+
- shared: $(LIBSO)
-
- so: $(LIBSO)
-
+--- sio/Makefile.in.orig Sun Oct 13 01:17:13 2002
++++ sio/Makefile.in Fri Jan 24 22:55:29 2003
+@@ -73,5 +73,6 @@
$(LIBSO): $(SOBJS)
-- /bin/rm -f $(LIBSO)
-- gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
-- chmod a+r $(LIB) sio.h usio.h
-- -@/bin/ls -l $(LIBSO)
-+ /bin/rm -f $(LIBSO) $(LIBSOS)
+ /bin/rm -f "$(LIBSO)" "$(LIBSOS)"
+- gcc -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
+ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
+ $(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
-+ chmod a+r $(LIBSO) sio.h usio.h
-+ /bin/ln -s "$(LIBSO)" "$(LIBSOS)"
-+ -@/bin/ls -l "$(LIBSOS)" "$(LIBSO)"
-
- soinstall: $(LIBSO)
- cp $(LIBSO) $(PREFIX)/lib/$(LIBSO)
+ chmod a+r "$(LIBSO)" sio.h usio.h
+ /bin/ln -s "$(LIBSO)" "$(LIBSOS)"