proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

11 files changed, 419 insertions, 0 deletions

diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
new file mode 100644
index 000000000000..cadaa8c0a174
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
@@ -0,0 +1,21 @@
+--- httrack-3.44.1/src/minizip/ioapi.h
++++ httrack-3.44.1/src/minizip/ioapi.h
+@@ -9,6 +9,7 @@
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
++#define OF(x) x
+ 
+ #define ZLIB_FILEFUNC_SEEK_CUR (1)
+ #define ZLIB_FILEFUNC_SEEK_END (2)
+--- httrack-3.44.1/src/minizip/zip.h
++++ httrack-3.44.1/src/minizip/zip.h
+@@ -42,6 +42,8 @@
+       ftp://ftp.pkware.com/probdesc.zip
+ */
+ 
++#define OF(x) x
++
+ #ifndef _zip_H
+ #define _zip_H
+ 
diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch b/www-client/httrack/files/httrack-3.45.4-cflags.patch
new file mode 100644
index 000000000000..a84c499f9d88
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-cflags.patch
@@ -0,0 +1,12 @@
+--- /configure.in	2012-07-10 20:19:09.958552772 +0200
++++ /configure.in	2012-07-10 20:19:39.011189564 +0200
+@@ -13,8 +13,7 @@
+ AC_PROG_LN_S
+ 
+ ### Default CFLAGS
+-DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
++DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+ -Wnested-externs -D_REENTRANT"
+ AC_SUBST(DEFAULT_CFLAGS)
diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
new file mode 100644
index 000000000000..d13fe14ddc61
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
@@ -0,0 +1,35 @@
+--- html/Makefile.am	2012-07-10 19:54:41.844906721 +0200
++++ html/Makefile.am	2012-07-10 19:54:47.885831199 +0200
+@@ -1,13 +1,13 @@
+ 
+-HelpHtmlrootdir = $(datadir)/doc/httrack
+-HelpHtmldir = $(datadir)/doc/httrack/html
+-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
+-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
+-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
+-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
+-WebHtmldir = $(datadir)/doc/httrack/html/server
+-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
+-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
++HelpHtmlrootdir = $(docdir)
++HelpHtmldir = $(htmldir)
++HelpHtmlimgdir = $(HelpHtmldir)/img
++HelpHtmldivdir = $(HelpHtmldir)/div
++HelpHtmlimagesdir = $(HelpHtmldir)/images
++HelpHtmlTxtdir = $(HelpHtmldir)
++WebHtmldir = $(HelpHtmldir)/server
++WebHtmlimagesdir = $(HelpHtmldir)/server/images
++WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
+ WebPixmapdir = $(datadir)/pixmaps
+ WebGPixmapdir = $(datadir)/httrack/icons
+ VFolderEntrydir = $(prefix)/share/applications
+@@ -36,8 +36,6 @@
+ install-data-hook:
+ 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
+ 		( cd $(DESTDIR)$(prefix)/share/httrack \
+-			&& mv -f ../doc/httrack/html html \
+-			&& cd ../doc/httrack/ \
+-			&& $(LN_S) ../../httrack/html html \
++			&& $(LN_S) $(htmldir) html \
+ 		) \
+ 	fi
diff --git a/www-client/httrack/files/httrack-3.45.4-install-once.patch b/www-client/httrack/files/httrack-3.45.4-install-once.patch
new file mode 100644
index 000000000000..0590db59a9e2
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-install-once.patch
@@ -0,0 +1,32 @@
+From 1022a4f21ef2c4c7dc671261aa24e33d8e1223e0 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 22 Jun 2012 22:38:21 +0200
+Subject: [PATCH] Make sure that files example.{c,h} are matched once
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise "make install" dies with this error:
+
+/usr/bin/install: will not overwrite just-created ‘[..]/example.c’ with ‘example.c’
+/usr/bin/install: will not overwrite just-created ‘[..]/example.h’ with ‘example.h’
+make[2]: *** [install-exemplesDATA] Error 1
+---
+ libtest/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index 7e90ba0..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ exemplesdir = $(datadir)/httrack/libtest
+-exemples_DATA = example.* *.c *.h *.txt
++exemples_DATA = *.c *.h *.txt
+ EXTRA_DIST = $(exemples_DATA)
+ 
+ INCLUDES = \
+-- 
+1.7.10.2
+
diff --git a/www-client/httrack/files/httrack-3.45.4-parallel.patch b/www-client/httrack/files/httrack-3.45.4-parallel.patch
new file mode 100644
index 000000000000..72424639c41e
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.45.4-parallel.patch
@@ -0,0 +1,68 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,8 @@ INCLUDES = \
+ 
+ bin_PROGRAMS = proxytrack httrack htsserver
+ 
+-httrack_LDADD = $(THREADS_LIBS) -lhttrack
+-htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++httrack_LDADD = $(THREADS_LIBS) libhttrack.la
++htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
+ proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
+ proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT
+ 
+@@ -69,7 +69,7 @@ libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS)
+ libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
+ libhtsjava_la_SOURCES = htsjava.c htsjava.h
+-libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) -lhttrack
++libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
+ libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
+ EXTRA_DIST = httrack.h webhttrack \
+--- a/libtest/Makefile.am	2012-06-19 21:41:25.913281858 +0200
++++ b/libtest/Makefile.am	2012-06-19 21:42:25.864532364 +0200
+@@ -18,33 +18,33 @@
+ 
+ # Examples
+ libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
+-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libbaselinks_la_LDFLAGS = -version-info 1:0:0
+ libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
+-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libchangecontent_la_LDFLAGS = -version-info 1:0:0
+ libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
+-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+ libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
+-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+ libfilename2_la_SOURCES =  callbacks-example-filename2.c
+-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename2_la_LDFLAGS = -version-info 1:0:0
+ libfilename_la_SOURCES =  callbacks-example-filename.c
+-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename_la_LDFLAGS = -version-info 1:0:0
+ libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
+-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+ liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
+-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblistlinks_la_LDFLAGS = -version-info 1:0:0
+ liblog_la_SOURCES =  callbacks-example-log.c
+-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblog_la_LDFLAGS = -version-info 1:0:0
+ libsimple_la_SOURCES =  callbacks-example-simple.c
+-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libsimple_la_LDFLAGS = -version-info 1:0:0
+ pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.46.1-parallel.patch b/www-client/httrack/files/httrack-3.46.1-parallel.patch
new file mode 100644
index 000000000000..97623299bae9
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.46.1-parallel.patch
@@ -0,0 +1,48 @@
+diff --git a/libtest/Makefile.am b/libtest/Makefile.am
+index d7c8309..4be2158 100644
+--- a/libtest/Makefile.am
++++ b/libtest/Makefile.am
+@@ -18,33 +18,33 @@ AM_LDFLAGS = -L../src
+ 
+ # Examples
+ libbaselinks_la_SOURCES =  callbacks-example-baselinks.c
+-libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libbaselinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libbaselinks_la_LDFLAGS = -version-info 1:0:0
+ libchangecontent_la_SOURCES =  callbacks-example-changecontent.c
+-libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libchangecontent_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libchangecontent_la_LDFLAGS = -version-info 1:0:0
+ libcontentfilter_la_SOURCES =  callbacks-example-contentfilter.c
+-libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libcontentfilter_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libcontentfilter_la_LDFLAGS = -version-info 1:0:0
+ libdisplayheader_la_SOURCES =  callbacks-example-displayheader.c
+-libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libdisplayheader_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libdisplayheader_la_LDFLAGS = -version-info 1:0:0
+ libfilename2_la_SOURCES =  callbacks-example-filename2.c
+-libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename2_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename2_la_LDFLAGS = -version-info 1:0:0
+ libfilename_la_SOURCES =  callbacks-example-filename.c
+-libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilename_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilename_la_LDFLAGS = -version-info 1:0:0
+ libfilenameiisbug_la_SOURCES =  callbacks-example-filenameiisbug.c
+-libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libfilenameiisbug_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libfilenameiisbug_la_LDFLAGS = -version-info 1:0:0
+ liblistlinks_la_SOURCES =  callbacks-example-listlinks.c
+-liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblistlinks_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblistlinks_la_LDFLAGS = -version-info 1:0:0
+ liblog_la_SOURCES =  callbacks-example-log.c
+-liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++liblog_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ liblog_la_LDFLAGS = -version-info 1:0:0
+ libsimple_la_SOURCES =  callbacks-example-simple.c
+-libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lhttrack
++libsimple_la_LIBADD = $(THREADS_LIBS) $(SOCKET_LIBS) $(top_builddir)/src/libhttrack.la
+ libsimple_la_LDFLAGS = -version-info 1:0:0
+ pkglib_LTLIBRARIES = libbaselinks.la libchangecontent.la libcontentfilter.la libdisplayheader.la libfilename2.la libfilename.la libfilenameiisbug.la liblistlinks.la liblog.la libsimple.la
diff --git a/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
new file mode 100644
index 000000000000..83b12cbff934
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.2-ac-config-headers.patch
@@ -0,0 +1,24 @@
+From c56dfdd0f208a5a9413ad90f40c4a25ebb961598 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 25 Apr 2013 22:35:09 +0200
+Subject: [PATCH] Replace deprecated AM_CONFIG_HEADER by AC_CONFIG_HEADERS
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index e132eef..71b3458 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ AC_INIT(src/httrack.c)
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE(httrack, 3.47.2)
+ VERSION_INFO="2:47:0"
+ AM_MAINTAINER_MODE
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.47.26-desktop.patch b/www-client/httrack/files/httrack-3.47.26-desktop.patch
new file mode 100644
index 000000000000..fd9174363fdf
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.26-desktop.patch
@@ -0,0 +1,37 @@
+From 48500945ca9717907189389d0a57e6df5f09a82c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 8 Sep 2013 22:34:13 +0200
+Subject: [PATCH] Fix .desktop files validation
+
+---
+ html/server/div/WebHTTrack-Websites.desktop | 2 +-
+ html/server/div/WebHTTrack.desktop          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/html/server/div/WebHTTrack-Websites.desktop b/html/server/div/WebHTTrack-Websites.desktop
+index 6efcab8..d36a4f9 100644
+--- a/html/server/div/WebHTTrack-Websites.desktop
++++ b/html/server/div/WebHTTrack-Websites.desktop
+@@ -5,6 +5,6 @@ Categories=Network;
+ Terminal=false
+ Name=Browse Mirrored Websites
+ Comment=Browse Websites Mirrored by WebHTTrack
+-Keywords=browse mirrored
++Keywords=browse mirrored;
+ Exec=webhttrack browse
+ Icon=httrack
+diff --git a/html/server/div/WebHTTrack.desktop b/html/server/div/WebHTTrack.desktop
+index 984f4c7..28591f2 100644
+--- a/html/server/div/WebHTTrack.desktop
++++ b/html/server/div/WebHTTrack.desktop
+@@ -5,6 +5,6 @@ Categories=Network;
+ Terminal=false
+ Name=WebHTTrack Website Copier
+ Comment=Copy websites to your computer
+-Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation
++Keywords=copy website;backup website;capture website;offline browser;surf offline;mirror;mirroring;archiving;forensics;crawl;preservation;
+ Exec=webhttrack
+ Icon=httrack
+-- 
+1.8.2.1
+
diff --git a/www-client/httrack/files/httrack-3.47.7-cflags.patch b/www-client/httrack/files/httrack-3.47.7-cflags.patch
new file mode 100644
index 000000000000..aa414b96402f
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.7-cflags.patch
@@ -0,0 +1,27 @@
+From f780de5a662deeea66df4dc9056ac642c447bbaf Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 3 May 2013 00:58:15 +0200
+Subject: [PATCH] Fix CFLAGS
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c956081..7ceeb39 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,9 +14,8 @@ AM_PROG_LIBTOOL
+ AC_PROG_LN_S
+ 
+ ### Default CFLAGS
+-DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
++DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+ -Wnested-externs -D_REENTRANT"
+ AC_SUBST(DEFAULT_CFLAGS)
+ 
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.47.7-warnings.patch b/www-client/httrack/files/httrack-3.47.7-warnings.patch
new file mode 100644
index 000000000000..9f6ba964800b
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.47.7-warnings.patch
@@ -0,0 +1,41 @@
+From 80d9d1b3003ff79ddee26e9fd09eb1b746b6bf5c Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 4 May 2013 00:14:32 +0200
+Subject: [PATCH] Fix GCC warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+httrack.c: In function ‘htsshow_loop’:
+httrack.c:446:21: warning: the address of ‘tempo’ will always evaluate as ‘true’
+httrack.c:480:19: warning: the address of ‘s’ will always evaluate as ‘true’
+httrack.c:484:19: warning: the address of ‘s’ will always evaluate as ‘true’
+---
+ src/httrack.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/httrack.h b/src/httrack.h
+index 8b049a1..90ca9d5 100644
+--- a/src/httrack.h
++++ b/src/httrack.h
+@@ -129,7 +129,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strncatbuff(A, B, N) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+@@ -158,7 +158,7 @@ extern FILE* ioinfo;
+ } while(0)
+ #define strcpybuff(A, B) do { \
+   assertf( (A) != NULL ); \
+-  if ( ! (B) ) { assertf( 0 ); } \
++  if ( (B) == NULL ) { assertf( 0 ); } \
+   if (htsMemoryFastXfr) { \
+     if (sizeof(A) != sizeof(char*)) { \
+       (A)[sizeof(A) - 1] = '\0'; \
+-- 
+1.8.1.5
+
diff --git a/www-client/httrack/files/httrack-3.48.13-minizip.patch b/www-client/httrack/files/httrack-3.48.13-minizip.patch
new file mode 100644
index 000000000000..af1610c60dae
--- /dev/null
+++ b/www-client/httrack/files/httrack-3.48.13-minizip.patch
@@ -0,0 +1,74 @@
+From 51bbb53d5805bfa5a4530b8706e2b7f77555016d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 9 Jun 2014 15:34:43 +0200
+Subject: [PATCH] Fix minizip fork compilation
+
+---
+ src/minizip/ioapi.h   | 4 ++++
+ src/minizip/iowin32.h | 3 +++
+ src/minizip/unzip.h   | 4 ++++
+ src/minizip/zip.h     | 4 ++++
+ 4 files changed, 15 insertions(+)
+
+diff --git a/src/minizip/ioapi.h b/src/minizip/ioapi.h
+index e4462b8..75cc097 100644
+--- a/src/minizip/ioapi.h
++++ b/src/minizip/ioapi.h
+@@ -21,6 +21,10 @@
+ #ifndef _ZLIBIOAPI64_H
+ #define _ZLIBIOAPI64_H
+ 
++
++#define OF(x) x
++
++
+ #if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+ 
+   // Linux needs this to support file operation on files larger then 4+GB
+diff --git a/src/minizip/iowin32.h b/src/minizip/iowin32.h
+index 0ca0969..71244d6 100644
+--- a/src/minizip/iowin32.h
++++ b/src/minizip/iowin32.h
+@@ -14,6 +14,9 @@
+ #include <windows.h>
+ 
+ 
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/src/minizip/unzip.h b/src/minizip/unzip.h
+index 2104e39..0b54c40 100644
+--- a/src/minizip/unzip.h
++++ b/src/minizip/unzip.h
+@@ -43,6 +43,10 @@
+ #ifndef _unz64_H
+ #define _unz64_H
+ 
++
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/src/minizip/zip.h b/src/minizip/zip.h
+index 16dea6b..906ba53 100644
+--- a/src/minizip/zip.h
++++ b/src/minizip/zip.h
+@@ -40,6 +40,10 @@
+ #ifndef _zip12_H
+ #define _zip12_H
+ 
++
++#define OF(x) x
++
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-- 
+1.9.3
+