diff options
| author | zangrc <zangrc.fnst@fujitsu.com> | 2021-04-23 01:56:52 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-04-23 08:56:25 -0700 |
| commit | 03115dcd5fce5199ad1bf9b1012857946831d246 (patch) | |
| tree | e2a26521f9ad111ff6d6497f54d20fc2bfe6a7a9 | |
| parent | 4b04112fddb7b2ef5d4b61975d385b386bbd9f5b (diff) | |
| download | meta-openembedded-03115dcd5fce5199ad1bf9b1012857946831d246.tar.gz | |
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>
| -rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch | 49 | ||||
| -rw-r--r-- | meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb (renamed from meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb) | 4 |
2 files changed, 32 insertions, 21 deletions
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch index 91508d721f..af99edcb5b 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 | 1 | From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2 | From: Benjamin Gaignard <benjamin.gaignard@linaro.org> |
| 3 | Date: Thu, 20 Apr 2017 14:25:18 +0200 | 3 | Date: Thu, 20 Apr 2017 14:25:18 +0200 |
| 4 | 4 | ||
| 5 | --- | 5 | --- |
| 6 | Makefile.am | 1 - | 6 | Makefile.am | 1 - |
| 7 | configure.ac | 9 --------- | 7 | configure.ac | 17 ----------------- |
| 8 | 2 files changed, 10 deletions(-) | 8 | 2 files changed, 18 deletions(-) |
| 9 | 9 | ||
| 10 | diff --git a/Makefile.am b/Makefile.am | 10 | diff --git a/Makefile.am b/Makefile.am |
| 11 | index e9113c2..2fe3d54 100644 | 11 | index 4a3ead6..a12cb98 100644 |
| 12 | --- a/Makefile.am | 12 | --- a/Makefile.am |
| 13 | +++ b/Makefile.am | 13 | +++ b/Makefile.am |
| 14 | @@ -2,7 +2,6 @@ SUBDIRS = \ | 14 | @@ -2,7 +2,6 @@ SUBDIRS = \ |
| @@ -17,24 +17,32 @@ index e9113c2..2fe3d54 100644 | |||
| 17 | etc \ | 17 | etc \ |
| 18 | - docs \ | 18 | - docs \ |
| 19 | m4macros \ | 19 | m4macros \ |
| 20 | tests | 20 | tests \ |
| 21 | 21 | scripts | |
| 22 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
| 23 | index 48ee0b2..a1a5fa1 100644 | 23 | index 3849383..9f3a633 100644 |
| 24 | --- a/configure.ac | 24 | --- a/configure.ac |
| 25 | +++ b/configure.ac | 25 | +++ b/configure.ac |
| 26 | @@ -194,10 +194,6 @@ AC_SUBST(ADDITIONAL_OBJECTS) | 26 | @@ -190,18 +190,6 @@ AC_SUBST(CPPFLAGS) |
| 27 | AC_PATH_PROG(XSLTPROC, xsltproc, no) | 27 | AC_SUBST(LIBS) |
| 28 | AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") | 28 | AC_SUBST(ADDITIONAL_OBJECTS) |
| 29 | 29 | ||
| 30 | -# Check for asciidoc | 30 | -if test x"$manpage_support_enabled" = x"yes"; then |
| 31 | -AC_PATH_PROG(A2X, a2x, no) | 31 | -AC_PATH_PROG(POD2MAN, pod2man, no) |
| 32 | -AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") | 32 | - |
| 33 | -if test "x$POD2MAN" = "xno" && \ | ||
| 34 | - ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then | ||
| 35 | -AC_MSG_ERROR([ | ||
| 36 | - manpage generation requested, but neither pod2man | ||
| 37 | - nor pre-generated manpages found. | ||
| 38 | - Use --disable-manpage-support if you want to compile anyway.]) | ||
| 39 | -fi | ||
| 40 | -fi #manpage_support_enabled | ||
| 33 | - | 41 | - |
| 34 | # checking xmllint | 42 | AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno") |
| 35 | AC_PATH_PROG(XMLLINT, xmllint, no) | 43 | |
| 36 | if test "x$XMLLINT" != "xno"; then | 44 | AC_PATH_PROG(GPERF, gperf, no) |
| 37 | @@ -219,11 +215,6 @@ src/Makefile | 45 | @@ -226,11 +214,6 @@ src/Makefile |
| 38 | data/Makefile | 46 | data/Makefile |
| 39 | data/templates/Makefile | 47 | data/templates/Makefile |
| 40 | etc/Makefile | 48 | etc/Makefile |
| @@ -46,3 +54,6 @@ index 48ee0b2..a1a5fa1 100644 | |||
| 46 | m4macros/Makefile | 54 | m4macros/Makefile |
| 47 | tests/Makefile | 55 | tests/Makefile |
| 48 | tests/scripts/Makefile | 56 | tests/scripts/Makefile |
| 57 | -- | ||
| 58 | 2.25.1 | ||
| 59 | |||
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb index 82d67014bb..7fb29279ea 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.10.0.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb | |||
| @@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz | |||
| 9 | file://tinyproxy.conf \ | 9 | file://tinyproxy.conf \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | SRC_URI[md5sum] = "423047c8dc53a15e19f78e238198549c" | 12 | SRC_URI[md5sum] = "658db5558ffb849414341b756a546a99" |
| 13 | SRC_URI[sha256sum] = "6020955e6a0ef0ef898ad5bb17a448c47f9e4c003c464b4ae7c4dba063272055" | 13 | SRC_URI[sha256sum] = "20f74769e40144e4d251d2977cc4c40d2d428a2bec8c1b8709cd07315454baef" |
| 14 | 14 | ||
| 15 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" | 15 | UPSTREAM_CHECK_URI = "https://github.com/tinyproxy/tinyproxy/releases" |
| 16 | 16 | ||
