Skip to contentSkip to conversation

tinyproxy: New package

PATCH New Peter Seiderer 4 participants 6 messages Mar 13, 2020 – Mar 19, 2020

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH 1/1 tinyproxy: New package

Hello Alexander,

three minor review remarks, see below...

Quoted 52 lines · Alexander Mukhin
Signed-off-by Alexander Mukhin <[email protected]>
---
 DEVELOPERS                                       |  3 +++
 package/Config.in                                |  1 +
 ...001-remove-docs-subdir-from-Makefile.am.patch | 15 +++++++++++++++
 package/tinyproxy/Config.in                      | 16 ++++++++++++++++
 package/tinyproxy/tinyproxy.hash                 |  2 ++
 package/tinyproxy/tinyproxy.mk                   | 15 +++++++++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 package/tinyproxy/0001-remove-docs-subdir-from-Makefile.am.patch
 create mode 100644 package/tinyproxy/Config.in
 create mode 100644 package/tinyproxy/tinyproxy.hash
 create mode 100644 package/tinyproxy/tinyproxy.mk
DEVELOPERS +3 -0
index 10768a19ee..79a5e4d544 100644
@@ -131,6 +131,9 @@ F:	package/minimodem/
 N:	Alexander Lukichev <[email protected]>
 F:	package/openpgm/
 
+N:	Alexander Mukhin <[email protected]>
+F:	package/tinyproxy/
+
 N:	Alexander Sverdlin <[email protected]>
 F:	package/mini-snmpd/
package/Config.in +1 -0
index 146fc1bbc3..0da893801e 100644
@@ -2169,6 +2169,7 @@ endif
 	source "package/thttpd/Config.in"
 	source "package/tinc/Config.in"
 	source "package/tinyhttpd/Config.in"
+	source "package/tinyproxy/Config.in"
 	source "package/tinyssh/Config.in"
 	source "package/tor/Config.in"
 	source "package/traceroute/Config.in"
package/tinyproxy/0001-remove-docs-subdir-from-Makefile.am.patch new file +5 -0
new file mode 100644
index 0000000000..646a4a53ba
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4a3ead6..a12cb98 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@ SUBDIRS = \

package/tinyproxy/0001-remove-docs-subdir-from-Makefile.am.patch line 15

Quoted 10 lines
package/tinyproxy/0001-remove-docs-subdir-from-Makefile.am.patch new file +10 -0
+ 	src \
+ 	data \
+ 	etc \
+-	docs \
+ 	m4macros \
+ 	tests
+
+--
+2.20.1
+

Patch missed a Signed-of-by line from you (and git formatted patches preferred)...

Quoted 6 lines
package/tinyproxy/Config.in new file +0 -0
new file mode 100644
index 0000000000..50f40ba524

package/tinyproxy/Config.in line 8

Quoted 8 lines
package/tinyproxy/Config.in new file +8 -0
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_TINYPROXY
+	bool "tinyproxy"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  Tinyproxy is a small, efficient HTTP/SSL proxy daemon released
+	  under the GNU General Public License.  Tinyproxy is very

One space before the new sentence is enough...

package/tinyproxy/Config.in line 11

Quoted 3 lines
package/tinyproxy/Config.in new file +3 -0
+	  useful in a small network setting, where a larger proxy would
+	  be too resource intensive.
+

Empty line needs no tab...

Quoted 24 lines
package/tinyproxy/Config.in new file +5 -0
+	  https://tinyproxy.github.io
+
+comment "tinyproxy needs a toolchain w/ threads, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+	depends on BR2_USE_MMU
package/tinyproxy/tinyproxy.hash new file +2 -0
new file mode 100644
index 0000000000..2d439de517
@@ -0,0 +1,2 @@
+# locally computed
+sha256 ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 tinyproxy-1.10.0.tar.gz
package/tinyproxy/tinyproxy.mk new file +5 -0
new file mode 100644
index 0000000000..3e0479d22b
@@ -0,0 +1,15 @@
+################################################################################
+#
+# tinyproxy
+#
+################################################################################

package/tinyproxy/tinyproxy.mk line 15

Quoted 10 lines
package/tinyproxy/tinyproxy.mk new file +10 -0
+
+TINYPROXY_VERSION = 1.10.0
+TINYPROXY_SITE = $(call github,tinyproxy,tinyproxy,$(TINYPROXY_VERSION))
+TINYPROXY_LICENSE = GPL-2.0
+TINYPROXY_LICENSE_FILES = COPYING
+
+# building from a git clone
+TINYPROXY_AUTORECONF = YES
+
+$(eval $(autotools-package))

Your can do a quick check doing:

	$ ./utils/check-package package/tinyproxy/*
package/tinyproxy/0001-remove-docs-subdir-from-Makefile.am.patch:0: missing Signed-off-by in the header (http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches)
package/tinyproxy/Config.in:11: line contains trailing whitespace
48 lines processed
2 warnings generated

Regards,
Peter

#1 lore raw

PATCH 1/1 package/tinyproxy: new package

Tinyproxy is a small, efficient HTTP/SSL proxy daemon.

https://tinyproxy.github.io

Signed-off-by Alexander Mukhin <[email protected]>
---
 DEVELOPERS                                    |  3 +++
 package/Config.in                             |  1 +
 .../0001-Makefile.am-remove-docs-subdir.patch | 27 +++++++++++++++++++
 package/tinyproxy/Config.in                   | 16 +++++++++++
 package/tinyproxy/tinyproxy.hash              |  2 ++
 package/tinyproxy/tinyproxy.mk                | 15 +++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch
 create mode 100644 package/tinyproxy/Config.in
 create mode 100644 package/tinyproxy/tinyproxy.hash
 create mode 100644 package/tinyproxy/tinyproxy.mk
DEVELOPERS +3 -0
index 5394150e5a..a3df15d903 100644
@@ -132,6 +132,9 @@ F:	package/minimodem/
 N:	Alexander Lukichev <[email protected]>
 F:	package/openpgm/
 
+N:	Alexander Mukhin <[email protected]>
+F:	package/tinyproxy/
+
 N:	Alexander Sverdlin <[email protected]>
 F:	package/mini-snmpd/
package/Config.in +1 -0
index 146fc1bbc3..0da893801e 100644
@@ -2169,6 +2169,7 @@ endif
 	source "package/thttpd/Config.in"
 	source "package/tinc/Config.in"
 	source "package/tinyhttpd/Config.in"
+	source "package/tinyproxy/Config.in"
 	source "package/tinyssh/Config.in"
 	source "package/tor/Config.in"
 	source "package/traceroute/Config.in"
package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch new file +27 -0
new file mode 100644
index 0000000000..e2a08678a3
@@ -0,0 +1,27 @@
+From 7ce6ee22057489d280e0ea5f6439edbbf0ad7ee2 Mon Sep 17 00:00:00 2001
+From: Alexander Mukhin <[email protected]>
+Date: Sat, 14 Mar 2020 12:45:29 +0300
+Subject: [PATCH] Makefile.am: remove docs subdir
+
+This avoids building the documentation, which requires asciidoc.
+
+Signed-off-by: Alexander Mukhin <[email protected]>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e9113c2..2fe3d54 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@ SUBDIRS = \
+ 	src \
+ 	data \
+ 	etc \
+-	docs \
+ 	m4macros \
+ 	tests
+ 
+-- 
+2.20.1
+
package/tinyproxy/Config.in new file +16 -0
new file mode 100644
index 0000000000..aec2ab81a8
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_TINYPROXY
+	bool "tinyproxy"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  Tinyproxy is a small, efficient HTTP/SSL proxy daemon released
+	  under the GNU General Public License. Tinyproxy is very
+	  useful in a small network setting, where a larger proxy would
+	  be too resource intensive.
+
+	  https://tinyproxy.github.io
+
+comment "tinyproxy needs a toolchain w/ threads, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+	depends on BR2_USE_MMU
package/tinyproxy/tinyproxy.hash new file +2 -0
new file mode 100644
index 0000000000..2d439de517
@@ -0,0 +1,2 @@
+# locally computed
+sha256 ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 tinyproxy-1.10.0.tar.gz
package/tinyproxy/tinyproxy.mk new file +15 -0
new file mode 100644
index 0000000000..3ba3d7f664
@@ -0,0 +1,15 @@
+################################################################################
+#
+# tinyproxy
+#
+################################################################################
+
+TINYPROXY_VERSION = 1.10.0
+TINYPROXY_SITE = $(call github,tinyproxy,tinyproxy,$(TINYPROXY_VERSION))
+TINYPROXY_LICENSE = GPL-2.0+
+TINYPROXY_LICENSE_FILES = COPYING
+
+# building from a git clone
+TINYPROXY_AUTORECONF = YES
+
+$(eval $(autotools-package))
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH 1/1 package/tinyproxy: new package

Hello Alexander,

only one minor nitpick...

Quoted 116 lines · Alexander Mukhin

Tinyproxy is a small, efficient HTTP/SSL proxy daemon.

https://tinyproxy.github.io

Signed-off-by Alexander Mukhin <[email protected]>
---
 DEVELOPERS                                    |  3 +++
 package/Config.in                             |  1 +
 .../0001-Makefile.am-remove-docs-subdir.patch | 27 +++++++++++++++++++
 package/tinyproxy/Config.in                   | 16 +++++++++++
 package/tinyproxy/tinyproxy.hash              |  2 ++
 package/tinyproxy/tinyproxy.mk                | 15 +++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch
 create mode 100644 package/tinyproxy/Config.in
 create mode 100644 package/tinyproxy/tinyproxy.hash
 create mode 100644 package/tinyproxy/tinyproxy.mk
DEVELOPERS +3 -0
index 5394150e5a..a3df15d903 100644
@@ -132,6 +132,9 @@ F:	package/minimodem/
 N:	Alexander Lukichev <[email protected]>
 F:	package/openpgm/
 
+N:	Alexander Mukhin <[email protected]>
+F:	package/tinyproxy/
+
 N:	Alexander Sverdlin <[email protected]>
 F:	package/mini-snmpd/
package/Config.in +1 -0
index 146fc1bbc3..0da893801e 100644
@@ -2169,6 +2169,7 @@ endif
 	source "package/thttpd/Config.in"
 	source "package/tinc/Config.in"
 	source "package/tinyhttpd/Config.in"
+	source "package/tinyproxy/Config.in"
 	source "package/tinyssh/Config.in"
 	source "package/tor/Config.in"
 	source "package/traceroute/Config.in"
package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch new file +27 -0
new file mode 100644
index 0000000000..e2a08678a3
@@ -0,0 +1,27 @@
+From 7ce6ee22057489d280e0ea5f6439edbbf0ad7ee2 Mon Sep 17 00:00:00 2001
+From: Alexander Mukhin <[email protected]>
+Date: Sat, 14 Mar 2020 12:45:29 +0300
+Subject: [PATCH] Makefile.am: remove docs subdir
+
+This avoids building the documentation, which requires asciidoc.
+
+Signed-off-by: Alexander Mukhin <[email protected]>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e9113c2..2fe3d54 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@ SUBDIRS = \
+ 	src \
+ 	data \
+ 	etc \
+-	docs \
+ 	m4macros \
+ 	tests
+
+--
+2.20.1
+
package/tinyproxy/Config.in new file +16 -0
new file mode 100644
index 0000000000..aec2ab81a8
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_TINYPROXY
+	bool "tinyproxy"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  Tinyproxy is a small, efficient HTTP/SSL proxy daemon released
+	  under the GNU General Public License. Tinyproxy is very
+	  useful in a small network setting, where a larger proxy would
+	  be too resource intensive.
+
+	  https://tinyproxy.github.io
+
+comment "tinyproxy needs a toolchain w/ threads, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+	depends on BR2_USE_MMU
package/tinyproxy/tinyproxy.hash new file +2 -0
new file mode 100644
index 0000000000..2d439de517
@@ -0,0 +1,2 @@
+# locally computed
+sha256 ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 tinyproxy-1.10.0.tar.gz
package/tinyproxy/tinyproxy.mk new file +3 -0
new file mode 100644
index 0000000000..3ba3d7f664
@@ -0,0 +1,15 @@
+################################################################################
+#
+# tinyproxy

package/tinyproxy/tinyproxy.mk line 13

Quoted 10 lines
package/tinyproxy/tinyproxy.mk new file +10 -0
+#
+################################################################################
+
+TINYPROXY_VERSION = 1.10.0
+TINYPROXY_SITE = $(call github,tinyproxy,tinyproxy,$(TINYPROXY_VERSION))
+TINYPROXY_LICENSE = GPL-2.0+
+TINYPROXY_LICENSE_FILES = COPYING
+
+# building from a git clone
+TINYPROXY_AUTORECONF = YES

better:

# building from a git clone and patching Makefile.am

With this fixed you can add my

Reviewed-by Peter Seiderer <[email protected]>

Regards,
Peter

Quoted 2 lines
package/tinyproxy/tinyproxy.mk new file +2 -0
+
+$(eval $(autotools-package))
Applied
#3 lore raw

PATCH 1/1 package/tinyproxy: new package

In reply to Alexander Mukhin
Quoted 5 lines · On Sat, 14 Mar 2020 13:23:23 +0300 Alexander Mukhin…

Tinyproxy is a small, efficient HTTP/SSL proxy daemon.

https://tinyproxy.github.io

Signed-off-by Alexander Mukhin <[email protected]>
Quoted 12 lines
---
 DEVELOPERS                                    |  3 +++
 package/Config.in                             |  1 +
 .../0001-Makefile.am-remove-docs-subdir.patch | 27 +++++++++++++++++++
 package/tinyproxy/Config.in                   | 16 +++++++++++
 package/tinyproxy/tinyproxy.hash              |  2 ++
 package/tinyproxy/tinyproxy.mk                | 15 +++++++++++
 6 files changed, 64 insertions(+)
 create mode 100644 package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch
 create mode 100644 package/tinyproxy/Config.in
 create mode 100644 package/tinyproxy/tinyproxy.hash
 create mode 100644 package/tinyproxy/tinyproxy.mk

Applied to master, thanks. Thanks Peter Seiderer for the review.

Alexander: could you submit a patch upstream that adds --disable-doc option, or that detects the availability of asciidoc before building the documentation ?

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/tinyproxy: use the release tarball, not a git clone

Upstream ships distribution tarballs with pre-built manpages and necessary fixes, so that the build doesn't break if asciidoc is not available.

Signed-off-by Alexander Mukhin <[email protected]>
---
 .../0001-Makefile.am-remove-docs-subdir.patch | 27 -------------------
 package/tinyproxy/tinyproxy.hash              |  2 +-
 package/tinyproxy/tinyproxy.mk                |  6 ++---
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch
package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch deleted +0 -27
deleted file mode 100644
index e2a08678a3..0000000000
@@ -1,27 +0,0 @@
-From 7ce6ee22057489d280e0ea5f6439edbbf0ad7ee2 Mon Sep 17 00:00:00 2001
-From: Alexander Mukhin <[email protected]>
-Date: Sat, 14 Mar 2020 12:45:29 +0300
-Subject: [PATCH] Makefile.am: remove docs subdir
-
-This avoids building the documentation, which requires asciidoc.
-
-Signed-off-by: Alexander Mukhin <[email protected]>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e9113c2..2fe3d54 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
- 	tests
- 
--- 
-2.20.1
-
package/tinyproxy/tinyproxy.hash +1 -1
index 2d439de517..099c974881 100644
@@ -1,2 +1,2 @@
 # locally computed
-sha256 ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 tinyproxy-1.10.0.tar.gz
+sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2
package/tinyproxy/tinyproxy.mk +2 -4
index f1a2a50c32..305be922f5 100644
@@ -5,11 +5,9 @@
 ################################################################################
 
 TINYPROXY_VERSION = 1.10.0
-TINYPROXY_SITE = $(call github,tinyproxy,tinyproxy,$(TINYPROXY_VERSION))
+TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION)
+TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.bz2
 TINYPROXY_LICENSE = GPL-2.0+
 TINYPROXY_LICENSE_FILES = COPYING
 
-# building from a git clone and patching Makefile.am
-TINYPROXY_AUTORECONF = YES
-
 $(eval $(autotools-package))
Signature · 1 line
2.20.1
Applied
#5 lore raw

PATCH 1/1 package/tinyproxy: use the release tarball, not a git clone

Alexander, All,

On 2020-03-19 17:04 +0300, Alexander Mukhin spake thusly:

Quoted 5 lines

Upstream ships distribution tarballs with pre-built manpages and necessary fixes, so that the build doesn't break if asciidoc is not available.

Signed-off-by Alexander Mukhin <[email protected]>

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 73 lines
---
 .../0001-Makefile.am-remove-docs-subdir.patch | 27 -------------------
 package/tinyproxy/tinyproxy.hash              |  2 +-
 package/tinyproxy/tinyproxy.mk                |  6 ++---
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch
package/tinyproxy/0001-Makefile.am-remove-docs-subdir.patch deleted +0 -27
deleted file mode 100644
index e2a08678a3..0000000000
@@ -1,27 +0,0 @@
-From 7ce6ee22057489d280e0ea5f6439edbbf0ad7ee2 Mon Sep 17 00:00:00 2001
-From: Alexander Mukhin <[email protected]>
-Date: Sat, 14 Mar 2020 12:45:29 +0300
-Subject: [PATCH] Makefile.am: remove docs subdir
-
-This avoids building the documentation, which requires asciidoc.
-
-Signed-off-by: Alexander Mukhin <[email protected]>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e9113c2..2fe3d54 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
- 	tests
- 
--- 
-2.20.1
-
package/tinyproxy/tinyproxy.hash +1 -1
index 2d439de517..099c974881 100644
@@ -1,2 +1,2 @@
 # locally computed
-sha256 ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 tinyproxy-1.10.0.tar.gz
+sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2
package/tinyproxy/tinyproxy.mk +2 -4
index f1a2a50c32..305be922f5 100644
@@ -5,11 +5,9 @@
 ################################################################################
 
 TINYPROXY_VERSION = 1.10.0
-TINYPROXY_SITE = $(call github,tinyproxy,tinyproxy,$(TINYPROXY_VERSION))
+TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION)
+TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.bz2
 TINYPROXY_LICENSE = GPL-2.0+
 TINYPROXY_LICENSE_FILES = COPYING
 
-# building from a git clone and patching Makefile.am
-TINYPROXY_AUTORECONF = YES
-
 $(eval $(autotools-package))
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'