Skip to contentSkip to conversation

automake: bump to version 1.12.6

PATCH New Gustavo Zacarias 3 participants 13 messages Sep 16, 2013 – Sep 19, 2013 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 automake: bump to version 1.12.6

---
 package/automake/automake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/automake/automake.mk +1 -1
index ab4a1ac..94a84dd 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUTOMAKE_VERSION = 1.11.6
+AUTOMAKE_VERSION = 1.12.6
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 AUTOMAKE_LICENSE = GPLv2+
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/6 libcdaudio: disable autoreconf

There's no stated purpose and it breaks with automake 1.12+ If it breaks in some scenario ping me, i've got a patch to fix the autoreconf issue and re-enable it.

---
 package/libcdaudio/libcdaudio.mk | 3 ---
 1 file changed, 3 deletions(-)
package/libcdaudio/libcdaudio.mk +0 -3
index 151bb8c..06f8926 100644
@@ -5,10 +5,7 @@
 ################################################################################
 
 LIBCDAUDIO_VERSION = 0.99.12p2
-LIBCDAUDIO_SOURCE = libcdaudio-$(LIBCDAUDIO_VERSION).tar.gz
 LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)/
-LIBCDAUDIO_AUTORECONF = YES
-LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
 LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
 
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/6 libcdaudio: disable autoreconf

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> There's no stated purpose and it breaks with automake 1.12+ Gustavo> If it breaks in some scenario ping me, i've got a patch to fix the Gustavo> autoreconf issue and re-enable it.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/6 linux-pam: bump to version 1.1.7

In reply to Gustavo Zacarias

And fix build breakage with newer automake versions (mkdir_p deprecation).

---
 ...onfigure.patch => linux-pam-01-configure.patch} |  0
 ...am.patch => linux-pam-02-doc-makefile-am.patch} |  0
 ...ux-pam-group.patch => linux-pam-03-group.patch} |  0
 package/linux-pam/linux-pam-04-mkdir.patch         | 17 ++++++++++
 ...am-succeed.patch => linux-pam-05-succeed.patch} |  0
 ...inux-pam-time.patch => linux-pam-06-time.patch} |  0
 ...-pam-rhosts.patch => linux-pam-07-rhosts.patch} |  0
 ...pam_unix-fix-build-in-enable-selinux-mode.patch | 37 ----------------------
 package/linux-pam/linux-pam.mk                     |  2 +-
 9 files changed, 18 insertions(+), 38 deletions(-)
 rename package/linux-pam/{linux-pam-configure.patch => linux-pam-01-configure.patch} (100%)
 rename package/linux-pam/{linux-pam-doc-makefile-am.patch => linux-pam-02-doc-makefile-am.patch} (100%)
 rename package/linux-pam/{linux-pam-group.patch => linux-pam-03-group.patch} (100%)
 create mode 100644 package/linux-pam/linux-pam-04-mkdir.patch
 rename package/linux-pam/{linux-pam-succeed.patch => linux-pam-05-succeed.patch} (100%)
 rename package/linux-pam/{linux-pam-time.patch => linux-pam-06-time.patch} (100%)
 rename package/linux-pam/{linux-pam-rhosts.patch => linux-pam-07-rhosts.patch} (100%)
 delete mode 100644 package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch
package/linux-pam/linux-pam-01-configure.patch renamed from package/linux-pam/linux-pam-configure.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-configure.patch
rename to package/linux-pam/linux-pam-01-configure.patch
package/linux-pam/linux-pam-02-doc-makefile-am.patch renamed from package/linux-pam/linux-pam-doc-makefile-am.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-doc-makefile-am.patch
rename to package/linux-pam/linux-pam-02-doc-makefile-am.patch
package/linux-pam/linux-pam-03-group.patch renamed from package/linux-pam/linux-pam-group.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-group.patch
rename to package/linux-pam/linux-pam-03-group.patch
package/linux-pam/linux-pam-04-mkdir.patch new file +17 -0
new file mode 100644
index 0000000..00056da
@@ -0,0 +1,17 @@
+$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead.
+Upstream should really gettextize with a newer version before packing up.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura Linux-PAM-1.1.7.orig/po/Makefile.in.in Linux-PAM-1.1.7/po/Makefile.in.in
+--- Linux-PAM-1.1.7.orig/po/Makefile.in.in	2013-09-11 20:45:16.610770002 -0300
++++ Linux-PAM-1.1.7/po/Makefile.in.in	2013-09-11 20:45:28.030145316 -0300
+@@ -31,7 +31,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ mkinstalldirs = $(SHELL) @install_sh@ -d
+-mkdir_p = @mkdir_p@
++mkdir_p = @MKDIR_P@
+ 
+ GMSGFMT_ = @GMSGFMT@
+ GMSGFMT_no = @GMSGFMT@
package/linux-pam/linux-pam-05-succeed.patch renamed from package/linux-pam/linux-pam-succeed.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-succeed.patch
rename to package/linux-pam/linux-pam-05-succeed.patch
package/linux-pam/linux-pam-06-time.patch renamed from package/linux-pam/linux-pam-time.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-time.patch
rename to package/linux-pam/linux-pam-06-time.patch
package/linux-pam/linux-pam-07-rhosts.patch renamed from package/linux-pam/linux-pam-rhosts.patch +0 -0
similarity index 100%
rename from package/linux-pam/linux-pam-rhosts.patch
rename to package/linux-pam/linux-pam-07-rhosts.patch
package/linux-pam/linux-pam-pam_unix-fix-build-in-enable-selinux-mode.patch deleted +0 -37
deleted file mode 100644
index 550e02e..0000000
@@ -1,37 +0,0 @@
-From: "Dmitry V. Levin" <[email protected]>
-Date: Wed, 10 Oct 2012 18:13:07 +0000
-Subject: [PATCH] pam_unix: fix build in --enable-selinux mode
-
-glibc's <sys/wait.h> starting with commit
-http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=glibc-2.15-231-gd94a467
-does not include <sys/resource.h> for POSIX 2008 conformance reasons, so
-when pam is being built with SELinux support enabled, pam_unix_passwd.c
-uses getrlimit(2) and therefore should include <sys/resource.h> without
-relying on other headers.
-
-* modules/pam_unix/pam_unix_passwd.c: Include <sys/resource.h>.
-
-Reported-by: Guido Trentalancia <[email protected]>
-Reported-by: "Jory A. Pratt" <[email protected]>
-Reported-by: Diego Elio Petten? <[email protected]>
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
-[This patch is in linux-pam 1.1.6]
----
- modules/pam_unix/pam_unix_passwd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
-index 9e1302d..94bc3ec 100644
---- a/modules/pam_unix/pam_unix_passwd.c
-+++ b/modules/pam_unix/pam_unix_passwd.c
-@@ -58,6 +58,7 @@
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <security/_pam_macros.h>
- 
--- 
-1.8.2.1
-
package/linux-pam/linux-pam.mk +1 -1
index 4472cd4..6d57593 100644
@@ -4,7 +4,7 @@
 # 
 ################################################################################
 
-LINUX_PAM_VERSION = 1.1.6
+LINUX_PAM_VERSION = 1.1.7
 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
 LINUX_PAM_SITE = http://linux-pam.org/library/
 LINUX_PAM_INSTALL_STAGING = YES
Signature · 1 line
1.8.1.5
#4 lore raw

PATCH 3/6 linux-pam: bump to version 1.1.7

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> And fix build breakage with newer automake versions (mkdir_p Gustavo> deprecation).

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 4/6 mutt: fix automake breakage

In reply to Gustavo Zacarias

Fix breakage due to automake 1.12.6 bump.

---
 .../{mutt-1.5.21-nodoc.patch => mutt-01-nodoc.patch}     |  0
 package/mutt/mutt-02-automake.patch                      | 16 ++++++++++++++++
 2 files changed, 16 insertions(+)
 rename package/mutt/{mutt-1.5.21-nodoc.patch => mutt-01-nodoc.patch} (100%)
 create mode 100644 package/mutt/mutt-02-automake.patch
package/mutt/mutt-01-nodoc.patch renamed from package/mutt/mutt-1.5.21-nodoc.patch +0 -0
similarity index 100%
rename from package/mutt/mutt-1.5.21-nodoc.patch
rename to package/mutt/mutt-01-nodoc.patch
package/mutt/mutt-02-automake.patch new file +16 -0
new file mode 100644
index 0000000..19950a9
@@ -0,0 +1,16 @@
+Fix for automake 1.12+
+http://dev.mutt.org/trac/ticket/3579
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura mutt-1.5.21.orig/configure.ac mutt-1.5.21/configure.ac
+--- mutt-1.5.21.orig/configure.ac	2013-09-16 11:07:25.699781892 -0300
++++ mutt-1.5.21/configure.ac	2013-09-16 11:07:45.120419960 -0300
+@@ -27,7 +27,6 @@
+ 
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi
Signature · 1 line
1.8.1.5
#6 lore raw

PATCH 4/6 mutt: fix automake breakage

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Fix breakage due to automake 1.12.6 bump. Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 5/6 neardal: add fix for automake bump breakage

In reply to Gustavo Zacarias
---
 package/neardal/neardal-01-automake.patch | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/neardal/neardal-01-automake.patch
package/neardal/neardal-01-automake.patch new file +35 -0
new file mode 100644
index 0000000..e5d822e
@@ -0,0 +1,35 @@
+From 08f26bdd093c7f289638ab506b0e842bd93f3d0d Mon Sep 17 00:00:00 2001
+From: Dmytro Bagrii <[email protected]>
+Date: Thu, 14 Mar 2013 15:44:40 +0100
+Subject: [PATCH 1/2] Fix 'AM_PROG_AR' autogen.sh error There is an error while
+ running autogen.sh in some distributions (e.g. Archlinux, automake 1.13.1).
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a4a7c5..eb03a50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,6 @@
+ AC_INIT([neardal], 0.8.0, Neardal for Neard v0.8)
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+ 
+-AC_PROG_LIBTOOL
+ AC_CONFIG_HEADERS([config.h])
+ 
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -15,6 +14,8 @@ traces=no
+ 
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AM_PROG_AR
++AC_PROG_LIBTOOL
+ 
+ ## Compiler option
+ ## Debug ?
+-- 
+1.8.1.5
+
Signature · 1 line
1.8.1.5
#8 lore raw

PATCH 5/6 neardal: add fix for automake bump breakage

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#9 lore raw

PATCH 6/6 luaposix: bump to version 31

In reply to Gustavo Zacarias

Releases are no longer named 5.1.X, just the X portion remains now.

Fixes autoreconf issues with the automake bump, however since the patch is no longer required that's not an issue now.

---
 package/luaposix/luaposix-remove-lua-header-check.patch | 16 ----------------
 package/luaposix/luaposix.mk                            |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 package/luaposix/luaposix-remove-lua-header-check.patch
package/luaposix/luaposix-remove-lua-header-check.patch deleted +0 -16
deleted file mode 100644
index 7909b91..0000000
@@ -1,16 +0,0 @@
-Checking the Lua version inside the headers requires compiling a small
-C program. However, autoconf will raise an error when attempting to do so
-while cross-compiling. Hence, this specific test is removed.
-
-Signed-off-by: Assaf Inbal <[email protected]>
---- a/configure.ac	2013-06-20 07:23:27.943091833 +0300
-+++ b/configure.ac	2013-06-20 07:23:30.644441710 +0300
-@@ -105,7 +105,7 @@
- 
- dnl Lua 5.1 or 5.2
- AX_PROG_LUA(501, 503)
- AX_LUA_HEADERS
--AX_LUA_HEADERS_VERSION(501, 503)
-+#AX_LUA_HEADERS_VERSION(501, 503)
- AC_SUBST(LUA)
- AC_SUBST(LUA_INCLUDE)
package/luaposix/luaposix.mk +3 -3
index 1d1ee6a..ff99127 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 5.1.20
-LUAPOSIX_SITE = https://github.com/downloads/luaposix/luaposix
+LUAPOSIX_VERSION = 31
+LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive
+LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = COPYING
 LUAPOSIX_DEPENDENCIES = lua host-lua
 LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
-LUAPOSIX_AUTORECONF = YES
 
 $(eval $(autotools-package))
Signature · 1 line
1.8.1.5

A message that is not in the archive (sent off-list or not yet received): CAB0FRsv_EGVoE9rvUXKLPjEMGFptAum6rJXc2in=KyhnG3mv8Q@mail.gmail.com

#11 lore raw

PATCH 6/6 luaposix: bump to version 31

the build is OK, but it fails at runtime

# lua -l posix
lua: /usr/share/lua/posix.lua:5: module 'bit' not found:
       ...

fixed with :

package/luaposix/Config.in +2 -0
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LUAPOSIX
     bool "luaposix"
+    select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA
+    # LuaBitOp is already included in LuaJIT
     help
       luaposix is a POSIX binding, including curses, for Lua 5.1
       and 5.2; Like most libraries it simply binds to C APIs on

Fran?ois

2013/9/16 Gustavo Zacarias <[email protected]>:

Quoted 61 lines

Releases are no longer named 5.1.X, just the X portion remains now.

Fixes autoreconf issues with the automake bump, however since the patch is no longer required that's not an issue now.

---
 package/luaposix/luaposix-remove-lua-header-check.patch | 16 ----------------
 package/luaposix/luaposix.mk                            |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 package/luaposix/luaposix-remove-lua-header-check.patch
package/luaposix/luaposix-remove-lua-header-check.patch deleted +0 -16
deleted file mode 100644
index 7909b91..0000000
@@ -1,16 +0,0 @@
-Checking the Lua version inside the headers requires compiling a small
-C program. However, autoconf will raise an error when attempting to do so
-while cross-compiling. Hence, this specific test is removed.
-
-Signed-off-by: Assaf Inbal <[email protected]>
---- a/configure.ac     2013-06-20 07:23:27.943091833 +0300
-+++ b/configure.ac     2013-06-20 07:23:30.644441710 +0300
-@@ -105,7 +105,7 @@
-
- dnl Lua 5.1 or 5.2
- AX_PROG_LUA(501, 503)
- AX_LUA_HEADERS
--AX_LUA_HEADERS_VERSION(501, 503)
-+#AX_LUA_HEADERS_VERSION(501, 503)
- AC_SUBST(LUA)
- AC_SUBST(LUA_INCLUDE)
package/luaposix/luaposix.mk +3 -4
index 1d1ee6a..ff99127 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 5.1.20
-LUAPOSIX_SITE = https://github.com/downloads/luaposix/luaposix
+LUAPOSIX_VERSION = 31
+LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive
+LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = COPYING
 LUAPOSIX_DEPENDENCIES = lua host-lua
 LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
-LUAPOSIX_AUTORECONF = YES
 
 $(eval $(autotools-package))
--

1.8.1.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#12 lore raw

PATCH 6/6 luaposix: bump to version 31

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Releases are no longer named 5.1.X, just the X portion remains Gustavo> now. Fixes autoreconf issues with the automake bump, however Gustavo> since the patch is no longer required that's not an issue now.

It apparently now needs IPv6:

CC ext/posix/ext_posix_posix_c_la-posix.lo
ext/posix/posix.c: In function 'Psetsockopt':
ext/posix/posix.c:3642:10: error: 'IPV6_JOIN_GROUP' undeclared (first use in this function)

Committed with that dependency added, thanks.

Signature · 1 line
Bye, Peter Korsgaard