Skip to contentSkip to conversation

util-linux: add optional dependency on readline

PATCH New Rahul Bedarkar 3 participants 11 messages Sep 15, 2016 – Sep 16, 2016

lore
Share & tools
lore

Rahul Bedarkar

author
#0 lore raw

PATCH 1/7 util-linux: add optional dependency on readline

fdisk and sfdisk tools can be built with readline support. This patch adds optional dependency on readline if it is already selected.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/util-linux/util-linux.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/util-linux/util-linux.mk +7 -0
index aa6f994..7b16ca4 100644
@@ -146,6 +146,13 @@ else
 UTIL_LINUX_CONF_OPTS += --without-python
 endif
 
+ifeq ($(BR2_PACKAGE_READLINE),y)
+UTIL_LINUX_CONF_OPTS += --with-readline
+UTIL_LINUX_DEPENDENCIES += readline
+else
+UTIL_LINUX_CONF_OPTS += --without-readline
+endif
+
 # Install PAM configuration files
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
 define UTIL_LINUX_INSTALL_PAMFILES
Signature · 1 line
2.6.2
author
#1 lore raw

PATCH 2/7 util-linux: add optional dependency on audit

login and hwclock can be built with audit support. This patch adds optional dependency on audit package if it is already selected.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/util-linux/util-linux.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/util-linux/util-linux.mk +7 -0
index 7b16ca4..82230bc 100644
@@ -153,6 +153,13 @@ else
 UTIL_LINUX_CONF_OPTS += --without-readline
 endif
 
+ifeq ($(BR2_PACKAGE_AUDIT),y)
+UTIL_LINUX_CONF_OPTS += --with-audit
+UTIL_LINUX_DEPENDENCIES += audit
+else
+UTIL_LINUX_CONF_OPTS += --without-audit
+endif
+
 # Install PAM configuration files
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
 define UTIL_LINUX_INSTALL_PAMFILES
Signature · 1 line
2.6.2
Applied
#2 lore raw

PATCH 2/7 util-linux: add optional dependency on audit

Hello,

Quoted 7 lines · Rahul Bedarkar

login and hwclock can be built with audit support. This patch adds optional dependency on audit package if it is already selected.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/util-linux/util-linux.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 3/7 audit: disable autoreconf

In reply to Rahul Bedarkar

Commit upstream 51925b7dd6d0("package/audit: Bump to version 2.6.5") removed patch 0002 as part of version bump. But forgot to disable autoreconf.

Fixes 51925b7dd6d0("package/audit: Bump to version 2.6.5")
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.mk | 2 --
 1 file changed, 2 deletions(-)
package/audit/audit.mk +0 -2
index 06ec959..11ee8df 100644
@@ -8,8 +8,6 @@ AUDIT_VERSION = 2.6.5
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
 AUDIT_LICENSE = GPLv2
 AUDIT_LICENSE_FILES = COPYING
-# 0002-Fix-usage-of-audit_status.feature_bitmap.patch
-AUDIT_AUTORECONF = YES
 
 AUDIT_INSTALL_STAGING = YES
Signature · 1 line
2.6.2
Applied
#4 lore raw

PATCH 3/7 audit: disable autoreconf

Hello,

Quoted 9 lines · Rahul Bedarkar

Commit upstream 51925b7dd6d0("package/audit: Bump to version 2.6.5") removed patch 0002 as part of version bump. But forgot to disable autoreconf.

Fixes 51925b7dd6d0("package/audit: Bump to version 2.6.5")
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.mk | 2 --
 1 file changed, 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 4/7 audit: bump version to 2.6.7

In reply to Rahul Bedarkar
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.hash | 2 +-
 package/audit/audit.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/audit/audit.hash +1 -1
index 2ce381f..794a93a 100644
@@ -1,2 +1,2 @@
 #Locally computed
-sha256	d99339a63fc6efaaee89efe7fa0e0c395f661392a4ae5056b2c9d10c67ca63a1	audit-2.6.5.tar.gz
+sha256 8923917332daa7833bbc0c1d9eb012167093fbad000da4a9630fb3356aff8cdc audit-2.6.7.tar.gz
package/audit/audit.mk +1 -1
index 11ee8df..7137208 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUDIT_VERSION = 2.6.5
+AUDIT_VERSION = 2.6.7
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
 AUDIT_LICENSE = GPLv2
 AUDIT_LICENSE_FILES = COPYING
Signature · 1 line
2.6.2
Applied
#6 lore raw

PATCH 4/7 audit: bump version to 2.6.7

Hello,

Quoted 5 lines · Rahul Bedarkar
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.hash | 2 +-
 package/audit/audit.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#7 lore raw

PATCH 5/7 audit: update legal info

In reply to Rahul Bedarkar

Programs are released under GPLv2+. README file says libraries libaudit.* and libauparse.* are released under LGPL but there are two files auparse/strsplit.c and lib/strsplit.c which are released under GPLv2+ which makes both libraries GPL. Until we review situation with upstream, we don't add license for libraries.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/audit/audit.mk +1 -1
index 7137208..1a203ce 100644
@@ -6,7 +6,7 @@
 
 AUDIT_VERSION = 2.6.7
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
-AUDIT_LICENSE = GPLv2
+AUDIT_LICENSE = GPLv2+ (programs)
 AUDIT_LICENSE_FILES = COPYING
 
 AUDIT_INSTALL_STAGING = YES
Signature · 1 line
2.6.2
#8 lore raw

PATCH 5/7 audit: update legal info

Quoted 5 lines · Rahul Bedarkar

Programs are released under GPLv2+. README file says libraries libaudit.* and libauparse.* are released under LGPL but there are two files auparse/strsplit.c and lib/strsplit.c which are released under GPLv2+ which makes both libraries GPL. Until we review situation with upstream, we don't add license for libraries.

In that case, I'd prefer to add "unclear (libraries)".

Regards,
Arnout

Quoted 20 lines
Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/audit/audit.mk +1 -1
index 7137208..1a203ce 100644
@@ -6,7 +6,7 @@
 
 AUDIT_VERSION = 2.6.7
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
-AUDIT_LICENSE = GPLv2
+AUDIT_LICENSE = GPLv2+ (programs)
 AUDIT_LICENSE_FILES = COPYING
 
 AUDIT_INSTALL_STAGING = YES
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#9 lore raw

PATCH 5/7 audit: update legal info

In reply to Rahul Bedarkar

Hello,

Quoted 10 lines · Rahul Bedarkar

Programs are released under GPLv2+. README file says libraries libaudit.* and libauparse.* are released under LGPL but there are two files auparse/strsplit.c and lib/strsplit.c which are released under GPLv2+ which makes both libraries GPL. Until we review situation with upstream, we don't add license for libraries.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/audit/audit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, after taking into account Arnout's suggestion of adding "unclear (libraries)" to the license information.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#10 lore raw

PATCH 1/7 util-linux: add optional dependency on readline

In reply to Rahul Bedarkar

Hello,

Quoted 7 lines · Rahul Bedarkar

fdisk and sfdisk tools can be built with readline support. This patch adds optional dependency on readline if it is already selected.

Signed-off-by Rahul Bedarkar <[email protected]>
---
 package/util-linux/util-linux.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com