Wed Apr 27 22:24:53 UTC 2011

3 files changed, 47 insertions, 51 deletions

diff --git a/core/libfetch/Makefile b/core/libfetch/Makefile
index 53bcee9c4..34f3b1d99 100644
--- a/core/libfetch/Makefile
+++ b/core/libfetch/Makefile
@@ -5,31 +5,23 @@ FETCH_WITH_INET6 = true
 FETCH_WITH_OPENSSL = true
 
 WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \
-	   -Wpointer-arith -Wcast-align
-CFLAGS   = -O2 -pipe -I. -fPIC $(WARNINGS) \
-	   -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
+           -Wpointer-arith -Wcast-align
 
-CFLAGS	+= -DFTP_COMBINE_CWDS -DNETBSD
+CFLAGS  ?= -O2 -pipe
+
+CFLAGS  += -fPIC $(WARNINGS)
+CFLAGS  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
+CFLAGS  += -DFTP_COMBINE_CWDS -DNETBSD
 
 ifeq ($(strip $(FETCH_WITH_INET6)), true)
-CFLAGS+=	-DINET6
+CFLAGS  += -DINET6
 endif
 
 ifeq ($(strip $(FETCH_WITH_OPENSSL)), true)
-CFLAGS+=	-DWITH_SSL
-LDFLAGS=	-lssl -lcrypto
-endif
-
-ifeq ($(strip $(DEBUG)), true)
-CFLAGS += -g -DDEBUG
-else
-CFLAGS += -UDEBUG
+CFLAGS  += -DWITH_SSL
+LDADD   += -Wl,-lssl -Wl,-lcrypto
 endif
 
-CC = gcc
-LD = gcc
-AR = ar
-RANLIB = ranlib
 INSTALL = install -c -D
 
 OBJS= fetch.o common.o ftp.o http.o file.o
@@ -37,53 +29,40 @@ INCS= fetch.h common.h
 GEN = ftperr.h httperr.h
 MAN = libdownload.3
 
-#pretty print!
-E = @/bin/echo
-Q = @
-
 all: libfetch.so libfetch.a
 .PHONY: all
 
 %.o: %.c $(INCS) $(GEN)
-	$(E) "  compile   " $@
-	$(Q) $(CC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 ftperr.h: ftp.errors Makefile errlist.sh
-	$(E) "  generate  " $@
-	$(Q) ./errlist.sh ftp_errlist FTP ftp.errors > $@
+	./errlist.sh ftp_errlist FTP ftp.errors > $@
 
 httperr.h: http.errors Makefile errlist.sh
-	$(E) "  generate  " $@
-	$(Q) ./errlist.sh http_errlist HTTP http.errors > $@
+	./errlist.sh http_errlist HTTP http.errors > $@
 
 libfetch.so: $(GEN) $(INCS) $(OBJS)
-	$(E) "  build     " $@
-	$(Q) rm -f $@
-	$(Q) $(LD) $(LDFLAGS) *.o -shared -o $@
-	$(E) "  built with:  " $(CFLAGS)
+	rm -f $@
+	$(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@
 
 libfetch.a: $(GEN) $(INCS) $(OBJS)
-	$(E) "  build     " $@
-	$(Q) rm -f $@
-	$(Q) $(AR) rcs $@ *.o
-	$(Q) $(RANLIB) $@
-	$(E) "  built with:  " $(CFLAGS)
+	rm -f $@
+	$(AR) rcs $@ $(OBJS)
 
 clean:
-	$(E) "  clean     "
-	$(Q) rm -f libfetch.so libfetch.a *.o $(GEN)
+	rm -f libfetch.so libfetch.a *.o $(GEN)
 .PHONY: clean
 
 install: all
-	$(Q) $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
-	$(Q) $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
-	$(Q) $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
-	$(Q) $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3
+	$(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
+	$(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
+	$(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
+	$(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3
 .PHONY: install
 
 uninstall:
-	$(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
-	$(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
-	$(Q) rm -f $(DESTDIR)$(prefix)/include/fetch.h
-	$(Q) rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
+	rm -f $(DESTDIR)$(prefix)/include/fetch.h
+	rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3
 .PHONY: uninstall
diff --git a/core/libfetch/PKGBUILD b/core/libfetch/PKGBUILD
index 641e7d42c..328ebcf88 100644
--- a/core/libfetch/PKGBUILD
+++ b/core/libfetch/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id$
+# $Id:$
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Xavier Chantry <shiningxc@gmail.com>
 
 pkgname=libfetch
 pkgver=2.33
-pkgrel=1
+pkgrel=3
 pkgdesc="URL based download library"
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('openssl>=1.0.0')
 url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/"
 source=(Makefile
-        ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5167d18db7660228e75290fc7d25fe56'
-         'a176b94f7f30344ef8a71c047ca2136b')
+        ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz
+        fetch-handle-temp-redirect.patch)
+md5sums=('7dffdd5a81bb32084a2f45e61f70dcf9'
+         'a176b94f7f30344ef8a71c047ca2136b'
+         '2ee40d7e7d76c39ae5500d89075ef8a6')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
diff --git a/core/libfetch/fetch-handle-temp-redirect.patch b/core/libfetch/fetch-handle-temp-redirect.patch
new file mode 100644
index 000000000..351cbcfd8
--- /dev/null
+++ b/core/libfetch/fetch-handle-temp-redirect.patch
@@ -0,0 +1,15 @@
+Index: http.c
+===================================================================
+RCS file: /cvsroot/pkgsrc/net/libfetch/files/http.c,v
+retrieving revision 1.29
+diff -u -r1.29 http.c
+--- http.c	24 Jan 2010 19:10:35 -0000	1.29
++++ http.c	19 Apr 2011 13:29:04 -0000
+@@ -974,6 +974,7 @@
+ 		case HTTP_MOVED_PERM:
+ 		case HTTP_MOVED_TEMP:
+ 		case HTTP_SEE_OTHER:
++		case HTTP_TEMP_REDIRECT:
+ 			/*
+ 			 * Not so fine, but we still have to read the
+ 			 * headers to get the new location.