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>
This commit is contained in:
Jacobo Aragunde Pérez
2018-09-18 16:30:35 +02:00
committed by Khem Raj
parent a5718b3032
commit fa1156b91a
3 changed files with 26 additions and 25 deletions
@@ -1,19 +1,31 @@
--- a/configure.ac 2016-01-01 17:42:27.000000000 +0100 diff --git a/Makefile.am b/Makefile.am
+++ b/configure.ac 2017-04-20 14:03:37.238254471 +0200 index 4a3ead6..a12cb98 100644
@@ -284,24 +284,12 @@ --- a/Makefile.am
AC_SUBST(LIBS) +++ b/Makefile.am
AC_SUBST(ADDITIONAL_OBJECTS) @@ -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 -# Check for asciidoc
-AC_PATH_PROG(A2X, a2x, no) -AC_PATH_PROG(A2X, a2x, no)
-AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") -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([ # checking xmllint
Makefile AC_PATH_PROG(XMLLINT, xmllint, no)
src/Makefile if test "x$XMLLINT" != "xno"; then
@@ -202,11 +198,6 @@ src/Makefile
data/Makefile data/Makefile
data/templates/Makefile data/templates/Makefile
etc/Makefile etc/Makefile
@@ -25,13 +37,3 @@
m4macros/Makefile m4macros/Makefile
tests/Makefile tests/Makefile
tests/scripts/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
@@ -8,7 +8,7 @@ ExecStartPre=/bin/mkdir -p /var/log/tinyproxy
ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy
ExecStartPre=/bin/mkdir -p /var/run/tinyproxy ExecStartPre=/bin/mkdir -p /var/run/tinyproxy
ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy
ExecStart=/usr/sbin/tinyproxy -d ExecStart=/usr/bin/tinyproxy -d
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
@@ -7,13 +7,12 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz
file://disable-documentation.patch \ file://disable-documentation.patch \
file://tinyproxy.service" file://tinyproxy.service"
SRC_URI[md5sum] = "3b60f7d08e0821ed1a3e2cf1e5778cac" SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c"
SRC_URI[sha256sum] = "8234c879a129feee61efa98bac14a1a3e46e5cf08f01696a216940872aa70faf" SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055"
EXTRA_OECONF += " \ EXTRA_OECONF += " \
--enable-filter \ --enable-filter \
--enable-transparent \ --enable-transparent \
--disable-regexcheck \
--enable-reverse \ --enable-reverse \
--enable-upstream \ --enable-upstream \
--enable-xtinyproxy \ --enable-xtinyproxy \