diff options
author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2018-09-18 16:30:35 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-24 11:49:45 -0700 |
commit | fa1156b91a96103bb3f6b2d0943b81044d9ef1ee (patch) | |
tree | f22845a5acbe1ef17014333d69f3798f57a88ea2 /meta-networking | |
parent | a5718b30328c2bf208723514e934f71890fabcb3 (diff) | |
download | meta-openembedded-contrib-fa1156b91a96103bb3f6b2d0943b81044d9ef1ee.tar.gz |
tinyproxy: upgrade to version 1.10.0
Highlights of this upgrade:
* tinyproxy binary is not installed to /usr/sbin now.
* removed a deprecated configure parameter.
* reworked disable-documentation.patch.
Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch | 44 | ||||
-rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service | 2 | ||||
-rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb (renamed from meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb) | 5 |
3 files changed, 26 insertions, 25 deletions
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch index 01d0236be5..563fde3b48 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch @@ -1,19 +1,31 @@ ---- a/configure.ac 2016-01-01 17:42:27.000000000 +0100 -+++ b/configure.ac 2017-04-20 14:03:37.238254471 +0200 -@@ -284,24 +284,12 @@ - AC_SUBST(LIBS) - AC_SUBST(ADDITIONAL_OBJECTS) +diff --git a/Makefile.am b/Makefile.am +index 4a3ead6..a12cb98 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ SUBDIRS = \ + src \ + data \ + etc \ +- docs \ + m4macros \ + tests \ + scripts +diff --git a/configure.ac b/configure.ac +index 6ddbcc0..f993711 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -177,10 +177,6 @@ AC_SUBST(ADDITIONAL_OBJECTS) + AC_PATH_PROG(XSLTPROC, xsltproc, no) + AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") -# Check for asciidoc -AC_PATH_PROG(A2X, a2x, no) -AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") --if test x"$A2X" = x"no"; then -- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) --fi - - AC_CONFIG_FILES([ - Makefile - src/Makefile + # checking xmllint + AC_PATH_PROG(XMLLINT, xmllint, no) + if test "x$XMLLINT" != "xno"; then +@@ -202,11 +198,6 @@ src/Makefile data/Makefile data/templates/Makefile etc/Makefile @@ -25,13 +37,3 @@ m4macros/Makefile tests/Makefile tests/scripts/Makefile ---- a/Makefile.am 2016-01-01 17:42:27.000000000 +0100 -+++ b/Makefile.am 2017-04-20 14:03:53.842822997 +0200 -@@ -2,7 +2,6 @@ - src \ - data \ - etc \ -- docs \ - m4macros \ - tests - diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service index ea079f9556..df42745731 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service @@ -8,7 +8,7 @@ ExecStartPre=/bin/mkdir -p /var/log/tinyproxy ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy ExecStartPre=/bin/mkdir -p /var/run/tinyproxy ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy -ExecStart=/usr/sbin/tinyproxy -d +ExecStart=/usr/bin/tinyproxy -d [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb index 98192dc99f..144dcf33ac 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb @@ -7,13 +7,12 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://disable-documentation.patch \ file://tinyproxy.service" -SRC_URI[md5sum] = "3b60f7d08e0821ed1a3e2cf1e5778cac" -SRC_URI[sha256sum] = "8234c879a129feee61efa98bac14a1a3e46e5cf08f01696a216940872aa70faf" +SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c" +SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055" EXTRA_OECONF += " \ --enable-filter \ --enable-transparent \ - --disable-regexcheck \ --enable-reverse \ --enable-upstream \ --enable-xtinyproxy \ |