diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2003-03-12 18:06:24 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2003-03-12 18:06:24 +0000 |
commit | 52aabe4b3b1f44ed2f13e13721c393b0e2be7f61 (patch) | |
tree | 76090d82079cb5855ea5bcc819a00bbaadf46847 /ftp/ncftp3/files | |
parent | Readd patch from last commit. (diff) |
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>
Notes
Notes:
svn path=/head/; revision=77112
Diffstat (limited to 'ftp/ncftp3/files')
-rw-r--r-- | ftp/ncftp3/files/patch-af | 10 | ||||
-rw-r--r-- | ftp/ncftp3/files/patch-sio-Makefile.in | 30 |
2 files changed, 11 insertions, 29 deletions
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)" |