diff mbox

[v2,1/1] package/tripwire: new package

Message ID 1461705192-15282-1-git-send-email-bernd.kuhls@t-online.de
State Changes Requested
Headers show

Commit Message

Bernd Kuhls April 26, 2016, 9:13 p.m. UTC 
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: - fixed depends for comment (Thomas)
    - updated patch to git format and added note about why the patch was
      not sent upstream

 package/Config.in                                  |  1 +
 ...ent-running-an-interactive-install-script.patch | 39 ++++++++++++++++++++++
 package/tripwire/Config.in                         | 21 ++++++++++++
 package/tripwire/tripwire.hash                     |  2 ++
 package/tripwire/tripwire.mk                       | 15 +++++++++
 5 files changed, 78 insertions(+)
 create mode 100644 package/tripwire/0001-Prevent-running-an-interactive-install-script.patch
 create mode 100644 package/tripwire/Config.in
 create mode 100644 package/tripwire/tripwire.hash
 create mode 100644 package/tripwire/tripwire.mk

Comments

Thomas Petazzoni June 9, 2016, 9:57 p.m. UTC | #1 
Hello,

On Tue, 26 Apr 2016 23:13:12 +0200, Bernd Kuhls wrote:

> + install-data-hook:
> +-	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
> +-        path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
> +-        ./install/install.sh
> ++	$(mkdir_p) $(DESTDIR)$(sbindir)
> ++	$(install_sh_SCRIPT) install/install.sh $(DESTDIR)$(sbindir)

Why are you changing the logic that runs install.sh on the build
machine to a logic that installs install.sh to the target? How can
installing install.sh on the target be useful?

> ++#	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
> ++#        path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
> ++#        ./install/install.sh

Please don't commend the code, just remove it.

Could you submit a bug upstream (they use Github, so it's trivial) to
ask them to make install.sh non-interactive ?

Also, isn't this install.sh script doing this that are also useful
(other than stupidly asking the user to explicitly accept the license).

> diff --git a/package/tripwire/Config.in b/package/tripwire/Config.in
> new file mode 100644
> index 0000000..1373bb6
> --- /dev/null
> +++ b/package/tripwire/Config.in
> @@ -0,0 +1,21 @@
> +config BR2_PACKAGE_TRIPWIRE
> +	bool "tripwire"
> +	depends on BR2_INSTALL_LIBSTDCPP
> +	depends on BR2_USE_MMU # fork()
> +	depends on BR2_USE_WCHAR
> +	select BR2_PACKAGE_OPENSSL

OpenSSL is not mandatory. Use --enable-openssl / --disable-openssl to
make it optional in the .mk file.

> +TRIPWIRE_VERSION = 2.4.3.1
> +TRIPWIRE_SITE = $(call github,Tripwire,tripwire-open-source,$(TRIPWIRE_VERSION))
> +TRIPWIRE_LICENSE = GPLv2+

This license is a bit of an issue when OpenSSL support is enabled: the
GPL license and the OpenSSL license are incompatible, so you cannot
distribute a tripwire binary with OpenSSL support. They need to use a
GPL license with OpenSSL exception for the binary to be
redistributable. See
https://people.gnome.org/~markmc/openssl-and-the-gpl.html for details.

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index e860f72..a3f7163 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1675,6 +1675,7 @@  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/tar/Config.in"
 endif
 	source "package/tpm-tools/Config.in"
+	source "package/tripwire/Config.in"
 	source "package/unscd/Config.in"
 	source "package/util-linux/Config.in"
 endmenu
diff --git a/package/tripwire/0001-Prevent-running-an-interactive-install-script.patch b/package/tripwire/0001-Prevent-running-an-interactive-install-script.patch
new file mode 100644
index 0000000..d48432e
--- /dev/null
+++ b/package/tripwire/0001-Prevent-running-an-interactive-install-script.patch
@@ -0,0 +1,39 @@ 
+From e5da8136ee2028ca84fecd28c05a46d75504e383 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Tue, 26 Apr 2016 23:10:36 +0200
+Subject: [PATCH 1/1] Prevent running an interactive install script
+
+Downloaded from
+http://repository.timesys.com/buildsources/t/tripwire/tripwire-2.4.2.2/tripwire-2.4.2.2-disable-install-data-hook.patch
+
+Patch was not sent upstream because it changes the desired behaviour
+during the install process.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.in | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 342ff95..05a7ca3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -594,9 +594,12 @@ uninstall-info: uninstall-info-recursive
+ 
+ 
+ install-data-hook:
+-	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
+-        path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
+-        ./install/install.sh
++	$(mkdir_p) $(DESTDIR)$(sbindir)
++	$(install_sh_SCRIPT) install/install.sh $(DESTDIR)$(sbindir)
++#	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
++#        path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
++#        ./install/install.sh
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+-- 
+2.8.0.rc3
+
diff --git a/package/tripwire/Config.in b/package/tripwire/Config.in
new file mode 100644
index 0000000..1373bb6
--- /dev/null
+++ b/package/tripwire/Config.in
@@ -0,0 +1,21 @@ 
+config BR2_PACKAGE_TRIPWIRE
+	bool "tripwire"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Open Source Tripwire® software is a security and data integrity
+	  tool useful for monitoring and alerting on specific file
+	  change(s) on a range of systems. The project is based on code
+	  originally contributed by Tripwire, Inc. in 2000.
+	  Open Source Tripwire is suitable for monitoring a small number
+	  of Linux servers, where centralized control and reporting is
+	  not needed and professional support or system automation is not
+	  a requirement.
+
+	  https://github.com/Tripwire/tripwire-open-source
+
+comment "tripwire needs a toolchain w/ C++, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+	depends on BR2_USE_MMU
diff --git a/package/tripwire/tripwire.hash b/package/tripwire/tripwire.hash
new file mode 100644
index 0000000..2d78812
--- /dev/null
+++ b/package/tripwire/tripwire.hash
@@ -0,0 +1,2 @@ 
+# Locally computed
+sha256	9744af4de7ecb1d643442eb22f08c819556494bb6f56f5879e22c3438f2db896	tripwire-2.4.3.1.tar.gz
diff --git a/package/tripwire/tripwire.mk b/package/tripwire/tripwire.mk
new file mode 100644
index 0000000..5cf40ca
--- /dev/null
+++ b/package/tripwire/tripwire.mk
@@ -0,0 +1,15 @@ 
+################################################################################
+#
+# tripwire
+#
+################################################################################
+
+TRIPWIRE_VERSION = 2.4.3.1
+TRIPWIRE_SITE = $(call github,Tripwire,tripwire-open-source,$(TRIPWIRE_VERSION))
+TRIPWIRE_LICENSE = GPLv2+
+TRIPWIRE_LICENSE_FILES = COPYING
+TRIPWIRE_DEPENDENCIES = openssl
+TRIPWIRE_CONF_ENV = \
+	ac_cv_openssldir=$(STAGING_DIR)/usr
+
+$(eval $(autotools-package))