mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
tinyproxy: upgrade 1.10.0 -> 1.11.0
Refresh the following patch: disable-documentation.patch Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -4,11 +4,11 @@ Date: Thu, 20 Apr 2017 14:25:18 +0200
|
|||||||
|
|
||||||
---
|
---
|
||||||
Makefile.am | 1 -
|
Makefile.am | 1 -
|
||||||
configure.ac | 9 ---------
|
configure.ac | 17 -----------------
|
||||||
2 files changed, 10 deletions(-)
|
2 files changed, 18 deletions(-)
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
index e9113c2..2fe3d54 100644
|
index 4a3ead6..a12cb98 100644
|
||||||
--- a/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ b/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -2,7 +2,6 @@ SUBDIRS = \
|
@@ -2,7 +2,6 @@ SUBDIRS = \
|
||||||
@@ -17,24 +17,32 @@ index e9113c2..2fe3d54 100644
|
|||||||
etc \
|
etc \
|
||||||
- docs \
|
- docs \
|
||||||
m4macros \
|
m4macros \
|
||||||
tests
|
tests \
|
||||||
|
scripts
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 48ee0b2..a1a5fa1 100644
|
index 3849383..9f3a633 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -194,10 +194,6 @@ AC_SUBST(ADDITIONAL_OBJECTS)
|
@@ -190,18 +190,6 @@ AC_SUBST(CPPFLAGS)
|
||||||
AC_PATH_PROG(XSLTPROC, xsltproc, no)
|
AC_SUBST(LIBS)
|
||||||
AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
|
AC_SUBST(ADDITIONAL_OBJECTS)
|
||||||
|
|
||||||
-# Check for asciidoc
|
-if test x"$manpage_support_enabled" = x"yes"; then
|
||||||
-AC_PATH_PROG(A2X, a2x, no)
|
-AC_PATH_PROG(POD2MAN, pod2man, no)
|
||||||
-AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno")
|
|
||||||
-
|
-
|
||||||
# checking xmllint
|
-if test "x$POD2MAN" = "xno" && \
|
||||||
AC_PATH_PROG(XMLLINT, xmllint, no)
|
- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
|
||||||
if test "x$XMLLINT" != "xno"; then
|
-AC_MSG_ERROR([
|
||||||
@@ -219,11 +215,6 @@ src/Makefile
|
- manpage generation requested, but neither pod2man
|
||||||
|
- nor pre-generated manpages found.
|
||||||
|
- Use --disable-manpage-support if you want to compile anyway.])
|
||||||
|
-fi
|
||||||
|
-fi #manpage_support_enabled
|
||||||
|
-
|
||||||
|
AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno")
|
||||||
|
|
||||||
|
AC_PATH_PROG(GPERF, gperf, no)
|
||||||
|
@@ -226,11 +214,6 @@ src/Makefile
|
||||||
data/Makefile
|
data/Makefile
|
||||||
data/templates/Makefile
|
data/templates/Makefile
|
||||||
etc/Makefile
|
etc/Makefile
|
||||||
@@ -46,3 +54,6 @@ index 48ee0b2..a1a5fa1 100644
|
|||||||
m4macros/Makefile
|
m4macros/Makefile
|
||||||
tests/Makefile
|
tests/Makefile
|
||||||
tests/scripts/Makefile
|
tests/scripts/Makefile
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz
|
|||||||
file://tinyproxy.conf \
|
file://tinyproxy.conf \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c"
|
SRC_URI[md5sum] = "658db5558ffb849414341b756a546a99"
|
||||||
SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055"
|
SRC_URI[sha256sum] = "20f74769e40144e4d251d2977cc4c40d2d428a2bec8c1b8709cd07315454baef"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases"
|
UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases"
|
||||||
|
|
||||||
Reference in New Issue
Block a user