Add and update a number of packages

18 files changed, 180 insertions, 97 deletions

diff --git a/data/aptitude/_metadata/_googletest.dep b/data/aptitude/_metadata/_googletest.dep
new file mode 120000
index 000000000..14c22a596
--- /dev/null
+++ b/data/aptitude/_metadata/_googletest.dep
@@ -0,0 +1 @@
+../../_googletest
\ No newline at end of file
diff --git a/data/aptitude/_metadata/boost.dep b/data/aptitude/_metadata/boost.dep
new file mode 120000
index 000000000..e73292483
--- /dev/null
+++ b/data/aptitude/_metadata/boost.dep
@@ -0,0 +1 @@
+../../boost
\ No newline at end of file
diff --git a/data/aptitude/_metadata/librpmatch.dep b/data/aptitude/_metadata/librpmatch.dep
new file mode 120000
index 000000000..67e172ea7
--- /dev/null
+++ b/data/aptitude/_metadata/librpmatch.dep
@@ -0,0 +1 @@
+../../librpmatch
\ No newline at end of file
diff --git a/data/aptitude/_metadata/libxapian.dep b/data/aptitude/_metadata/libxapian.dep
new file mode 120000
index 000000000..af6ec0f7b
--- /dev/null
+++ b/data/aptitude/_metadata/libxapian.dep
@@ -0,0 +1 @@
+../../libxapian
\ No newline at end of file
diff --git a/data/aptitude/_metadata/version b/data/aptitude/_metadata/version
index 94404405e..ef5056161 100644
--- a/data/aptitude/_metadata/version
+++ b/data/aptitude/_metadata/version
@@ -1 +1 @@
-0.4.11.11
+0.8.10
diff --git a/data/aptitude/aptitude_0.4.11.11.orig.tar.gz b/data/aptitude/aptitude_0.4.11.11.orig.tar.gz
deleted file mode 100644
index 054f18be8..000000000
--- a/data/aptitude/aptitude_0.4.11.11.orig.tar.gz
+++ /dev/null
diff --git a/data/aptitude/aptitude_0.8.10.orig.tar.xz b/data/aptitude/aptitude_0.8.10.orig.tar.xz
new file mode 100644
index 000000000..c9e953277
--- /dev/null
+++ b/data/aptitude/aptitude_0.8.10.orig.tar.xz
diff --git a/data/aptitude/build.diff b/data/aptitude/build.diff
index 14709ad9e..b96af4656 100644
--- a/data/aptitude/build.diff
+++ b/data/aptitude/build.diff
@@ -1,12 +1,24 @@
-diff -ru aptitude_0.4.11.11.orig/Makefile.in aptitude_0.4.11.11.orig+iPhone/Makefile.in
---- aptitude_0.4.11.11.orig/Makefile.in	2008-11-20 03:17:12.000000000 +0000
-+++ aptitude_0.4.11.11.orig+iPhone/Makefile.in	2009-07-07 07:15:39.000000000 +0000
-@@ -215,7 +215,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in
--SUBDIRS = $(SRCDIRS) $(DOCDIRS) m4 po tests
-+SUBDIRS = $(SRCDIRS) m4
+diff -ur aptitude-0.8.10/Makefile.am aptitude-0.8.10+iPhone/Makefile.am
+--- aptitude-0.8.10/Makefile.am	2017-11-14 11:48:21.000000000 -1000
++++ aptitude-0.8.10+iPhone/Makefile.am	2018-08-30 15:25:48.000000000 -1000
+@@ -7,7 +7,7 @@
+ DOCDIRS=@DOCDIRS@
+ TESTDIRS=@TESTDIRS@
+ 
+-SUBDIRS=buildlib $(SRCDIRS) $(DOCDIRS) po $(TESTDIRS)
++SUBDIRS=buildlib $(SRCDIRS)
+ 
  dist_bin_SCRIPTS = aptitude-create-state-bundle aptitude-run-state-bundle
- MANPAGE_LOCALES = gl it pl
+ 
+diff -ur aptitude-0.8.10/Makefile.in aptitude-0.8.10+iPhone/Makefile.in
+--- aptitude-0.8.10/Makefile.in	2017-11-14 14:18:48.000000000 -1000
++++ aptitude-0.8.10+iPhone/Makefile.in	2018-08-30 15:25:38.000000000 -1000
+@@ -576,7 +576,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in compile test-driver
+-SUBDIRS = buildlib $(SRCDIRS) $(DOCDIRS) po $(TESTDIRS)
++SUBDIRS = buildlib $(SRCDIRS)
+ dist_bin_SCRIPTS = aptitude-create-state-bundle aptitude-run-state-bundle
+ MANPAGE_LOCALES = gl
  TLMANPAGES = $(wildcard $(srcdir)/aptitude.??.8)
diff --git a/data/aptitude/dqueue.diff b/data/aptitude/dqueue.diff
new file mode 100644
index 000000000..153028e1b
--- /dev/null
+++ b/data/aptitude/dqueue.diff
@@ -0,0 +1,16 @@
+diff -ur aptitude-0.8.10/src/generic/util/parsers.h aptitude-0.8.10+iPhone/src/generic/util/parsers.h
+--- aptitude-0.8.10/src/generic/util/parsers.h	2017-08-19 07:59:07.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/generic/util/parsers.h	2018-08-31 09:36:06.000000000 -1000
+@@ -72,12 +72,6 @@
+ 
+ #include <errno.h>
+ 
+-namespace std
+-{
+-  template<typename T, typename Alloc>
+-  class deque;
+-}
+-
+ namespace parsers
+ {
+   /** \defgroup Parser combinators in C++
diff --git a/data/aptitude/gmock.diff b/data/aptitude/gmock.diff
new file mode 100644
index 000000000..c8bd78eb9
--- /dev/null
+++ b/data/aptitude/gmock.diff
@@ -0,0 +1,34 @@
+diff -ur aptitude-0.8.10/configure aptitude-0.8.10+iPhone/configure
+--- aptitude-0.8.10/configure	2017-11-14 14:18:50.000000000 -1000
++++ aptitude-0.8.10+iPhone/configure	2018-08-31 16:44:30.000000000 -1000
+@@ -9699,7 +9699,7 @@
+ else
+                           LIBS="$OLD_LIBS -lpthread"
+          OLD_CPPFLAGS="$CPPFLAGS"
+-         CPPFLAGS="$CPPFLAGS -I/usr/src/googletest/googletest -I/usr/src/googletest/googlemock"
++         CPPFLAGS="$CPPFLAGS -I$GOOGLETEST/googletest/googletest -I$GOOGLETEST/googletest/googlemock"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9712,8 +9712,8 @@
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: source is in /usr/src/googletest/googlemock" >&5
+-$as_echo "source is in /usr/src/googletest/googlemock" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: source is in $GOOGLETEST/googletest/googlemock" >&5
++$as_echo "source is in $GOOGLETEST/googletest/googlemock" >&6; }
+             BUILD_LOCAL_GMOCK=1
+ else
+   as_fn_error $? "Can't figure out where Google Mock lives; either install the google-mock package or place the library in the link path" "$LINENO" 5
+@@ -12663,8 +12663,8 @@
+   done
+ }
+  ;;
+-    "copy-gtest":C) cp -uv /usr/src/googletest/googletest/src/gtest-all.cc tests/gtest-all.cc ;;
+-    "copy-gmock":C) cp -uv /usr/src/googletest/googlemock/src/gmock-all.cc tests/gmock-all.cc ;;
++    "copy-gtest":C) cp -v ${GOOGLETEST}/googletest/googletest/src/gtest-all.cc tests/gtest-all.cc ;;
++    "copy-gmock":C) cp -v ${GOOGLETEST}/googletest/googlemock/src/gmock-all.cc tests/gmock-all.cc ;;
+ 
+   esac
+ done # for ac_tag
diff --git a/data/aptitude/intl.diff b/data/aptitude/intl.diff
deleted file mode 100644
index 39fe13323..000000000
--- a/data/aptitude/intl.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru aptitude-0.4.4.orig/src/generic/apt/Makefile.in aptitude-0.4.4.orig+iPhone/src/generic/apt/Makefile.in
---- aptitude-0.4.4.orig/src/generic/apt/Makefile.in	2006-10-27 04:28:51.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/generic/apt/Makefile.in	2008-05-13 09:13:50.000000000 +0000
-@@ -305,7 +305,7 @@
- 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- pkg_hier_dump$(EXEEXT): $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_DEPENDENCIES) 
- 	@rm -f pkg_hier_dump$(EXEEXT)
--	$(CXXLINK) $(pkg_hier_dump_LDFLAGS) $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_LDADD) $(LIBS)
-+	$(CXXLINK) $(pkg_hier_dump_LDFLAGS) $(pkg_hier_dump_OBJECTS) $(pkg_hier_dump_LDADD) $(LIBS) $(INTLLIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -ru aptitude-0.4.4.orig/src/generic/problemresolver/Makefile.in aptitude-0.4.4.orig+iPhone/src/generic/problemresolver/Makefile.in
---- aptitude-0.4.4.orig/src/generic/problemresolver/Makefile.in	2006-10-27 04:28:51.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/generic/problemresolver/Makefile.in	2008-05-13 09:10:29.000000000 +0000
-@@ -234,7 +234,7 @@
- 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
- 	@rm -f test$(EXEEXT)
--	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-+	$(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) $(INTLLIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -ru aptitude-0.4.4.orig/src/Makefile.in aptitude-0.4.4.orig+iPhone/src/Makefile.in
---- aptitude-0.4.4.orig/src/Makefile.in	2006-10-27 04:28:50.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/Makefile.in	2008-05-13 09:36:20.000000000 +0000
-@@ -374,7 +374,7 @@
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- aptitude$(EXEEXT): $(aptitude_OBJECTS) $(aptitude_DEPENDENCIES) 
- 	@rm -f aptitude$(EXEEXT)
--	$(CXXLINK) $(aptitude_LDFLAGS) $(aptitude_OBJECTS) $(aptitude_LDADD) $(LIBS)
-+	$(CXXLINK) $(aptitude_LDFLAGS) $(aptitude_OBJECTS) $(aptitude_LDADD) $(LIBS) -liconv
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/data/aptitude/make.sh b/data/aptitude/make.sh
index 0846c54c6..cd029fb7b 100644
--- a/data/aptitude/make.sh
+++ b/data/aptitude/make.sh
@@ -1,6 +1,6 @@
 shopt -s extglob
 pkg:setup
-pkg:configure
-make AR="${PKG_TARG}-ar" CFLAGS='-O2 -mthumb'
+GOOGLETEST="$(PKG_WORK_ _googletest)" LIBS="-lrpmatch" CXXFLAGS="-std=c++14 -D_XOPEN_SOURCE_EXTENDED -Wno-error" CFLAGS="-D_XOPEN_SOURCE_EXTENDED" pkg:configure XAPIAN_CONFIG="$(PKG_DEST_ libxapian)/usr/bin/xapian-config" --disable-docs --disable-tests --disable-boost-lib-checks --with-boost-iostreams=boost_iostreams --with-boost-filesystem=boost_filesystem --with-boost-system=boost_system
+make AR="${PKG_TARG}-ar" -j8
 pkg:install
 rm -f "${PKG_DEST}"/usr/share/aptitude/!(aptitude-defaults|section-descriptions) #function_groups|function_pkgs
diff --git a/data/aptitude/namespace.diff b/data/aptitude/namespace.diff
deleted file mode 100644
index 3cc16639e..000000000
--- a/data/aptitude/namespace.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru aptitude_0.4.11.11.orig/src/generic/apt/matchers.cc aptitude_0.4.11.11.orig+iPhone/src/generic/apt/matchers.cc
---- aptitude_0.4.11.11.orig/src/generic/apt/matchers.cc	2008-11-20 03:17:12.000000000 +0000
-+++ aptitude_0.4.11.11.orig+iPhone/src/generic/apt/matchers.cc	2009-07-07 09:48:40.000000000 +0000
-@@ -4289,6 +4289,9 @@
-   return real_matcher->get_match(pkg, cache, records, stack);
- }
- 
-+namespace
-+{
-+
- class pkg_const_matcher : public pkg_matcher_real
- {
-   pkgCache::PkgIterator match_pkg;
-@@ -4333,6 +4336,8 @@
-   }
- };
- 
-+}
-+
- pkg_matcher *make_const_matcher(const pkgCache::PkgIterator &pkg)
- {
-   return new pkg_const_matcher(pkg);
diff --git a/data/aptitude/pkg_columnizer.diff b/data/aptitude/pkg_columnizer.diff
new file mode 100644
index 000000000..59b52f161
--- /dev/null
+++ b/data/aptitude/pkg_columnizer.diff
@@ -0,0 +1,24 @@
+diff -ur aptitude-0.8.10/src/pkg_columnizer.cc aptitude-0.8.10+iPhone/src/pkg_columnizer.cc
+--- aptitude-0.8.10/src/pkg_columnizer.cc	2017-08-19 07:59:07.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/pkg_columnizer.cc	2018-08-31 15:13:18.000000000 -1000
+@@ -70,8 +70,8 @@
+   {30, false, false},   // origin
+   {10, true, true},     // archive
+   {9, false, false},    // sizechange
+-  {strlen(PACKAGE), false, false},  // progname
+-  {strlen(VERSION), false, false},  // progver
++  {(unsigned int)strlen(PACKAGE), false, false},  // progname
++  {(unsigned int)strlen(VERSION), false, false},  // progver
+   {12, false, false},   // brokencount
+   {16, false, false},   // diskusage, example (max): "Disk: -2,587 kB "
+   {22, false, false},   // downloadsize, example (max): " DL: 2,586 kB/2,587 kB"
+@@ -396,7 +396,8 @@
+     case diskusage:
+       {
+ 	size_t bufsize = 256;
+-	char buf[bufsize] = "";
++	char buf[bufsize];
++	buf[0] = 0;
+ 	if (apt_cache_file && ((*apt_cache_file)->UsrSize() != 0))
+ 	  {
+ 	    char sign = ((*apt_cache_file)->UsrSize() > 0) ? '+' : '-';
diff --git a/data/aptitude/stringbuf.diff b/data/aptitude/stringbuf.diff
new file mode 100644
index 000000000..3e0d7a0ca
--- /dev/null
+++ b/data/aptitude/stringbuf.diff
@@ -0,0 +1,12 @@
+diff -ur aptitude-0.8.10/src/generic/util/util.cc aptitude-0.8.10+iPhone/src/generic/util/util.cc
+--- aptitude-0.8.10/src/generic/util/util.cc	2017-08-19 07:59:07.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/generic/util/util.cc	2018-08-31 09:24:23.000000000 -1000
+@@ -242,7 +242,7 @@
+ 	  // We need to copy "result", not "buf", because some
+ 	  // versions of strerror_r can return a static string and
+ 	  // leave "buf" alone.
+-	  string rval(result);
++	  string rval(buf);
+ 	  delete[] buf;
+ 	  return rval;
+ 	}
diff --git a/data/aptitude/timestamp.diff b/data/aptitude/timestamp.diff
deleted file mode 100644
index 7276fa8ed..000000000
--- a/data/aptitude/timestamp.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru aptitude-0.4.4.orig/src/main.cc aptitude-0.4.4.orig+iPhone/src/main.cc
---- aptitude-0.4.4.orig/src/main.cc	2006-10-27 04:26:08.000000000 +0000
-+++ aptitude-0.4.4.orig+iPhone/src/main.cc	2008-06-18 06:36:30.000000000 +0000
-@@ -96,8 +96,8 @@
- 
- static void show_version()
- {
--  printf(_("%s %s compiled at %s %s\n"),
--	   PACKAGE, VERSION, __DATE__, __TIME__);
-+  printf(_("%s %s\n"),
-+	   PACKAGE, VERSION);
- #ifdef __GNUC__
-   printf(_("Compiler: g++ %s\n"), __VERSION__);
- #endif
diff --git a/data/aptitude/turbulence.diff b/data/aptitude/turbulence.diff
deleted file mode 100644
index 19d1965c0..000000000
--- a/data/aptitude/turbulence.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru aptitude_0.4.11.11.orig/src/generic/apt/aptitude_resolver_universe.h aptitude_0.4.11.11.orig+iPhone/src/generic/apt/aptitude_resolver_universe.h
---- aptitude_0.4.11.11.orig/src/generic/apt/aptitude_resolver_universe.h	2008-11-20 03:17:12.000000000 +0000
-+++ aptitude_0.4.11.11.orig+iPhone/src/generic/apt/aptitude_resolver_universe.h	2014-06-12 08:14:47.000000000 +0000
-@@ -178,7 +178,7 @@
-   unsigned int get_id() const
-   {
-     if(!ver.end())
--      return ver->ID;
-+      return ver->ID2 << 16 | ver->ID1;
-     else
-       // non-installed versions are faked.
-       //
diff --git a/data/aptitude/wtf.diff b/data/aptitude/wtf.diff
new file mode 100644
index 000000000..a22c948d7
--- /dev/null
+++ b/data/aptitude/wtf.diff
@@ -0,0 +1,65 @@
+diff -ur /Users/sam/source/telesphoreo/telesphoreo-git/data/aptitude/aptitude-0.8.10+iPhone/src/generic/apt/config_file.cc ./src/generic/apt/config_file.cc
+--- /Users/sam/source/telesphoreo/telesphoreo-git/data/aptitude/aptitude-0.8.10+iPhone/src/generic/apt/config_file.cc	2017-08-19 07:59:07.000000000 -1000
++++ ./src/generic/apt/config_file.cc	2018-08-31 10:16:44.000000000 -1000
+@@ -32,7 +32,7 @@
+ #include <sstream>
+ #include <streambuf>
+ 
+-#include <error.h>
++#include <mach/error.h>
+ #include <sys/stat.h>
+ 
+ 
+diff -ur /Users/sam/source/telesphoreo/telesphoreo-git/data/aptitude/aptitude-0.8.10+iPhone/src/generic/problemresolver/problemresolver.h ./src/generic/problemresolver/problemresolver.h
+--- /Users/sam/source/telesphoreo/telesphoreo-git/data/aptitude/aptitude-0.8.10+iPhone/src/generic/problemresolver/problemresolver.h	2017-08-19 07:59:07.000000000 -1000
++++ ./src/generic/problemresolver/problemresolver.h	2018-08-31 10:14:01.000000000 -1000
+@@ -1705,11 +1704,12 @@
+   {
+     generic_problem_resolver &resolver;
+     const promotion &p;
++		search_graph graph;
+ 
+   public:
+     do_process_promotion(generic_problem_resolver &_resolver,
+-			 const promotion &_p)
+-      : resolver(_resolver), p(_p)
++			 const promotion &_p, search_graph _graph)
++      : resolver(_resolver), p(_p), graph(_graph)
+     {
+     }
+ 
+diff -ur aptitude-0.8.10/src/cmdline/cmdline_prompt.cc aptitude-0.8.10+iPhone/src/cmdline/cmdline_prompt.cc
+--- aptitude-0.8.10/src/cmdline/cmdline_prompt.cc	2017-08-19 07:59:07.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/cmdline/cmdline_prompt.cc	2018-08-31 15:02:33.000000000 -1000
+@@ -45,6 +45,7 @@
+ #include <generic/util/util.h>
+ 
+ // System includes:
++#include <rpmatch.h>
+ #include <apt-pkg/algorithms.h>
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/strutl.h>
+diff -ur aptitude-0.8.10/src/generic/problemresolver/Makefile.am aptitude-0.8.10+iPhone/src/generic/problemresolver/Makefile.am
+--- aptitude-0.8.10/src/generic/problemresolver/Makefile.am	2017-08-19 07:59:07.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/generic/problemresolver/Makefile.am	2018-08-31 15:04:07.000000000 -1000
+@@ -6,7 +6,7 @@
+ 
+ noinst_PROGRAMS=test
+ 
+-test_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a libgeneric-problemresolver.a
++test_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a libgeneric-problemresolver.a $(LIBINTL)
+ 
+ libgeneric_problemresolver_a_SOURCES = \
+ 	choice.h choice_indexed_map.h choice_set.h \
+diff -ur aptitude-0.8.10/src/generic/problemresolver/Makefile.in aptitude-0.8.10+iPhone/src/generic/problemresolver/Makefile.in
+--- aptitude-0.8.10/src/generic/problemresolver/Makefile.in	2017-11-14 14:18:49.000000000 -1000
++++ aptitude-0.8.10+iPhone/src/generic/problemresolver/Makefile.in	2018-08-31 15:03:38.000000000 -1000
+@@ -352,7 +352,7 @@
+ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src
+ EXTRA_DIST = model.tex test1.txt test3.txt test4.txt resolver_undo.h
+ noinst_LIBRARIES = libgeneric-problemresolver.a
+-test_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a libgeneric-problemresolver.a
++test_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a libgeneric-problemresolver.a -lintl
+ libgeneric_problemresolver_a_SOURCES = \
+ 	choice.h choice_indexed_map.h choice_set.h \
+ 	cost.cc cost.h \