IPFire-SCM December 2011

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core54, updated. ad768ac98b8b7445460f9402cc217e4fc7d79fbc
by git＠ipfire.org 18 Dec '11

18 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core54 has been updated via ad768ac98b8b7445460f9402cc217e4fc7d79fbc (commit) via 71d3bfd4553ca94c6a3e8a25554f66eb899cf4a7 (commit) from e23114f49c2cc5d5af3b811fc0e266434606bc9b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ad768ac98b8b7445460f9402cc217e4fc7d79fbc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 13:30:26 2011 +0100 squid: update to 3.1.18. enabled polish and russian error messages. commit 71d3bfd4553ca94c6a3e8a25554f66eb899cf4a7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 12:20:29 2011 +0100 core54: fix build on arm. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 150 ++++++++++---------- .../core/54/filelists/armv5tel/intelnet-modules | 6 + .../core/54/filelists/{ => i586}/intelnet-modules | 0 lfs/squid | 4 +- 4 files changed, 83 insertions(+), 77 deletions(-) create mode 100644 config/rootfiles/core/54/filelists/armv5tel/intelnet-modules rename config/rootfiles/core/54/filelists/{ => i586}/intelnet-modules (100%) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 461a2a2..2c37c17 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -390,7 +390,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_URN_RESOLVE #usr/lib/squid/errors/el/ERR_WRITE_ERROR #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/en +#usr/lib/squid/errors/en #usr/lib/squid/errors/en-au #usr/lib/squid/errors/en-bz #usr/lib/squid/errors/en-ca @@ -1134,43 +1134,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pl #usr/lib/squid/errors/pl-pl -#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_DIR_LISTING -#usr/lib/squid/errors/pl/ERR_DNS_FAIL -#usr/lib/squid/errors/pl/ERR_ESI -#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/pl/ERR_FTP_DISABLED -#usr/lib/squid/errors/pl/ERR_FTP_FAILURE -#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE -#usr/lib/squid/errors/pl/ERR_INVALID_REQ -#usr/lib/squid/errors/pl/ERR_INVALID_RESP -#usr/lib/squid/errors/pl/ERR_INVALID_URL -#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP -#usr/lib/squid/errors/pl/ERR_NO_RELAY -#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/pl/ERR_READ_ERROR -#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT -#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/pl/ERR_TOO_BIG -#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/pl/ERR_UNSUP_REQ -#usr/lib/squid/errors/pl/ERR_URN_RESOLVE -#usr/lib/squid/errors/pl/ERR_WRITE_ERROR -#usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/pl/ERR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/pl/ERR_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_DIR_LISTING +usr/lib/squid/errors/pl/ERR_DNS_FAIL +usr/lib/squid/errors/pl/ERR_ESI +usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED +usr/lib/squid/errors/pl/ERR_FTP_DISABLED +usr/lib/squid/errors/pl/ERR_FTP_FAILURE +usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/pl/ERR_ICAP_FAILURE +usr/lib/squid/errors/pl/ERR_INVALID_REQ +usr/lib/squid/errors/pl/ERR_INVALID_RESP +usr/lib/squid/errors/pl/ERR_INVALID_URL +usr/lib/squid/errors/pl/ERR_LIFETIME_EXP +usr/lib/squid/errors/pl/ERR_NO_RELAY +usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/pl/ERR_READ_ERROR +usr/lib/squid/errors/pl/ERR_READ_TIMEOUT +usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN +usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE +usr/lib/squid/errors/pl/ERR_TOO_BIG +usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/pl/ERR_UNSUP_REQ +usr/lib/squid/errors/pl/ERR_URN_RESOLVE +usr/lib/squid/errors/pl/ERR_WRITE_ERROR +usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt #usr/lib/squid/errors/pt-br #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED @@ -1290,43 +1290,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ru #usr/lib/squid/errors/ru-ru -#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_DIR_LISTING -#usr/lib/squid/errors/ru/ERR_DNS_FAIL -#usr/lib/squid/errors/ru/ERR_ESI -#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/ru/ERR_FTP_DISABLED -#usr/lib/squid/errors/ru/ERR_FTP_FAILURE -#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE -#usr/lib/squid/errors/ru/ERR_INVALID_REQ -#usr/lib/squid/errors/ru/ERR_INVALID_RESP -#usr/lib/squid/errors/ru/ERR_INVALID_URL -#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP -#usr/lib/squid/errors/ru/ERR_NO_RELAY -#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/ru/ERR_READ_ERROR -#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT -#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/ru/ERR_TOO_BIG -#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/ru/ERR_UNSUP_REQ -#usr/lib/squid/errors/ru/ERR_URN_RESOLVE -#usr/lib/squid/errors/ru/ERR_WRITE_ERROR -#usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/ru/ERR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD +usr/lib/squid/errors/ru/ERR_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_DIR_LISTING +usr/lib/squid/errors/ru/ERR_DNS_FAIL +usr/lib/squid/errors/ru/ERR_ESI +usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED +usr/lib/squid/errors/ru/ERR_FTP_DISABLED +usr/lib/squid/errors/ru/ERR_FTP_FAILURE +usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/ru/ERR_ICAP_FAILURE +usr/lib/squid/errors/ru/ERR_INVALID_REQ +usr/lib/squid/errors/ru/ERR_INVALID_RESP +usr/lib/squid/errors/ru/ERR_INVALID_URL +usr/lib/squid/errors/ru/ERR_LIFETIME_EXP +usr/lib/squid/errors/ru/ERR_NO_RELAY +usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/ru/ERR_READ_ERROR +usr/lib/squid/errors/ru/ERR_READ_TIMEOUT +usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN +usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE +usr/lib/squid/errors/ru/ERR_TOO_BIG +usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/ru/ERR_UNSUP_REQ +usr/lib/squid/errors/ru/ERR_URN_RESOLVE +usr/lib/squid/errors/ru/ERR_WRITE_ERROR +usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk #usr/lib/squid/errors/sk-sk #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED diff --git a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules new file mode 100644 index 0000000..83d1e8b --- /dev/null +++ b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules @@ -0,0 +1,6 @@ +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/i586/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules new file mode 100644 index 0000000..5e3439d --- /dev/null +++ b/config/rootfiles/core/54/filelists/i586/intelnet-modules @@ -0,0 +1,9 @@ +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/intelnet-modules deleted file mode 100644 index 5e3439d..0000000 --- a/config/rootfiles/core/54/filelists/intelnet-modules +++ /dev/null @@ -1,9 +0,0 @@ -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko diff --git a/lfs/squid b/lfs/squid index 6b71f0d..610154b 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.16 +VER = 3.1.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261 +$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 99f96fa93d504d15de16f972e141dfe01675532c
by git＠ipfire.org 18 Dec '11

18 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 99f96fa93d504d15de16f972e141dfe01675532c (commit) via 447dfa508d9669312449baa763d4be17677594f0 (commit) from 3f18f99624664607023ef4ba505c281faa3a48e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99f96fa93d504d15de16f972e141dfe01675532c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 13:30:26 2011 +0100 squid: update to 3.1.18. enabled polish and russian error messages. commit 447dfa508d9669312449baa763d4be17677594f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 12:20:29 2011 +0100 core54: fix build on arm. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 150 ++++++++++---------- .../core/54/filelists/armv5tel/intelnet-modules | 6 + .../core/54/filelists/{ => i586}/intelnet-modules | 0 lfs/squid | 4 +- 4 files changed, 83 insertions(+), 77 deletions(-) create mode 100644 config/rootfiles/core/54/filelists/armv5tel/intelnet-modules rename config/rootfiles/core/54/filelists/{ => i586}/intelnet-modules (100%) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 461a2a2..2c37c17 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -390,7 +390,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_URN_RESOLVE #usr/lib/squid/errors/el/ERR_WRITE_ERROR #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/en +#usr/lib/squid/errors/en #usr/lib/squid/errors/en-au #usr/lib/squid/errors/en-bz #usr/lib/squid/errors/en-ca @@ -1134,43 +1134,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pl #usr/lib/squid/errors/pl-pl -#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_DIR_LISTING -#usr/lib/squid/errors/pl/ERR_DNS_FAIL -#usr/lib/squid/errors/pl/ERR_ESI -#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/pl/ERR_FTP_DISABLED -#usr/lib/squid/errors/pl/ERR_FTP_FAILURE -#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE -#usr/lib/squid/errors/pl/ERR_INVALID_REQ -#usr/lib/squid/errors/pl/ERR_INVALID_RESP -#usr/lib/squid/errors/pl/ERR_INVALID_URL -#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP -#usr/lib/squid/errors/pl/ERR_NO_RELAY -#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/pl/ERR_READ_ERROR -#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT -#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/pl/ERR_TOO_BIG -#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/pl/ERR_UNSUP_REQ -#usr/lib/squid/errors/pl/ERR_URN_RESOLVE -#usr/lib/squid/errors/pl/ERR_WRITE_ERROR -#usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/pl/ERR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/pl/ERR_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_DIR_LISTING +usr/lib/squid/errors/pl/ERR_DNS_FAIL +usr/lib/squid/errors/pl/ERR_ESI +usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED +usr/lib/squid/errors/pl/ERR_FTP_DISABLED +usr/lib/squid/errors/pl/ERR_FTP_FAILURE +usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/pl/ERR_ICAP_FAILURE +usr/lib/squid/errors/pl/ERR_INVALID_REQ +usr/lib/squid/errors/pl/ERR_INVALID_RESP +usr/lib/squid/errors/pl/ERR_INVALID_URL +usr/lib/squid/errors/pl/ERR_LIFETIME_EXP +usr/lib/squid/errors/pl/ERR_NO_RELAY +usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/pl/ERR_READ_ERROR +usr/lib/squid/errors/pl/ERR_READ_TIMEOUT +usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN +usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE +usr/lib/squid/errors/pl/ERR_TOO_BIG +usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/pl/ERR_UNSUP_REQ +usr/lib/squid/errors/pl/ERR_URN_RESOLVE +usr/lib/squid/errors/pl/ERR_WRITE_ERROR +usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt #usr/lib/squid/errors/pt-br #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED @@ -1290,43 +1290,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ru #usr/lib/squid/errors/ru-ru -#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_DIR_LISTING -#usr/lib/squid/errors/ru/ERR_DNS_FAIL -#usr/lib/squid/errors/ru/ERR_ESI -#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/ru/ERR_FTP_DISABLED -#usr/lib/squid/errors/ru/ERR_FTP_FAILURE -#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE -#usr/lib/squid/errors/ru/ERR_INVALID_REQ -#usr/lib/squid/errors/ru/ERR_INVALID_RESP -#usr/lib/squid/errors/ru/ERR_INVALID_URL -#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP -#usr/lib/squid/errors/ru/ERR_NO_RELAY -#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/ru/ERR_READ_ERROR -#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT -#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/ru/ERR_TOO_BIG -#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/ru/ERR_UNSUP_REQ -#usr/lib/squid/errors/ru/ERR_URN_RESOLVE -#usr/lib/squid/errors/ru/ERR_WRITE_ERROR -#usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/ru/ERR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD +usr/lib/squid/errors/ru/ERR_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_DIR_LISTING +usr/lib/squid/errors/ru/ERR_DNS_FAIL +usr/lib/squid/errors/ru/ERR_ESI +usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED +usr/lib/squid/errors/ru/ERR_FTP_DISABLED +usr/lib/squid/errors/ru/ERR_FTP_FAILURE +usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/ru/ERR_ICAP_FAILURE +usr/lib/squid/errors/ru/ERR_INVALID_REQ +usr/lib/squid/errors/ru/ERR_INVALID_RESP +usr/lib/squid/errors/ru/ERR_INVALID_URL +usr/lib/squid/errors/ru/ERR_LIFETIME_EXP +usr/lib/squid/errors/ru/ERR_NO_RELAY +usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/ru/ERR_READ_ERROR +usr/lib/squid/errors/ru/ERR_READ_TIMEOUT +usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN +usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE +usr/lib/squid/errors/ru/ERR_TOO_BIG +usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/ru/ERR_UNSUP_REQ +usr/lib/squid/errors/ru/ERR_URN_RESOLVE +usr/lib/squid/errors/ru/ERR_WRITE_ERROR +usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk #usr/lib/squid/errors/sk-sk #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED diff --git a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules new file mode 100644 index 0000000..83d1e8b --- /dev/null +++ b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules @@ -0,0 +1,6 @@ +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/i586/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules new file mode 100644 index 0000000..5e3439d --- /dev/null +++ b/config/rootfiles/core/54/filelists/i586/intelnet-modules @@ -0,0 +1,9 @@ +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/intelnet-modules deleted file mode 100644 index 5e3439d..0000000 --- a/config/rootfiles/core/54/filelists/intelnet-modules +++ /dev/null @@ -1,9 +0,0 @@ -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko diff --git a/lfs/squid b/lfs/squid index 6b71f0d..610154b 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.16 +VER = 3.1.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261 +$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 99f96fa93d504d15de16f972e141dfe01675532c
by git＠ipfire.org 18 Dec '11

18 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 99f96fa93d504d15de16f972e141dfe01675532c (commit) from 447dfa508d9669312449baa763d4be17677594f0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 99f96fa93d504d15de16f972e141dfe01675532c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 13:30:26 2011 +0100 squid: update to 3.1.18. enabled polish and russian error messages. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 150 ++++++++++++++++++++-------------------- lfs/squid | 4 +- 2 files changed, 77 insertions(+), 77 deletions(-) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 461a2a2..2c37c17 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -390,7 +390,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_URN_RESOLVE #usr/lib/squid/errors/el/ERR_WRITE_ERROR #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/en +#usr/lib/squid/errors/en #usr/lib/squid/errors/en-au #usr/lib/squid/errors/en-bz #usr/lib/squid/errors/en-ca @@ -1134,43 +1134,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pl #usr/lib/squid/errors/pl-pl -#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_DIR_LISTING -#usr/lib/squid/errors/pl/ERR_DNS_FAIL -#usr/lib/squid/errors/pl/ERR_ESI -#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/pl/ERR_FTP_DISABLED -#usr/lib/squid/errors/pl/ERR_FTP_FAILURE -#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE -#usr/lib/squid/errors/pl/ERR_INVALID_REQ -#usr/lib/squid/errors/pl/ERR_INVALID_RESP -#usr/lib/squid/errors/pl/ERR_INVALID_URL -#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP -#usr/lib/squid/errors/pl/ERR_NO_RELAY -#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/pl/ERR_READ_ERROR -#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT -#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/pl/ERR_TOO_BIG -#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/pl/ERR_UNSUP_REQ -#usr/lib/squid/errors/pl/ERR_URN_RESOLVE -#usr/lib/squid/errors/pl/ERR_WRITE_ERROR -#usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/pl/ERR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/pl/ERR_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_DIR_LISTING +usr/lib/squid/errors/pl/ERR_DNS_FAIL +usr/lib/squid/errors/pl/ERR_ESI +usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED +usr/lib/squid/errors/pl/ERR_FTP_DISABLED +usr/lib/squid/errors/pl/ERR_FTP_FAILURE +usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/pl/ERR_ICAP_FAILURE +usr/lib/squid/errors/pl/ERR_INVALID_REQ +usr/lib/squid/errors/pl/ERR_INVALID_RESP +usr/lib/squid/errors/pl/ERR_INVALID_URL +usr/lib/squid/errors/pl/ERR_LIFETIME_EXP +usr/lib/squid/errors/pl/ERR_NO_RELAY +usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/pl/ERR_READ_ERROR +usr/lib/squid/errors/pl/ERR_READ_TIMEOUT +usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN +usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE +usr/lib/squid/errors/pl/ERR_TOO_BIG +usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/pl/ERR_UNSUP_REQ +usr/lib/squid/errors/pl/ERR_URN_RESOLVE +usr/lib/squid/errors/pl/ERR_WRITE_ERROR +usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt #usr/lib/squid/errors/pt-br #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED @@ -1290,43 +1290,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ru #usr/lib/squid/errors/ru-ru -#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_DIR_LISTING -#usr/lib/squid/errors/ru/ERR_DNS_FAIL -#usr/lib/squid/errors/ru/ERR_ESI -#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/ru/ERR_FTP_DISABLED -#usr/lib/squid/errors/ru/ERR_FTP_FAILURE -#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE -#usr/lib/squid/errors/ru/ERR_INVALID_REQ -#usr/lib/squid/errors/ru/ERR_INVALID_RESP -#usr/lib/squid/errors/ru/ERR_INVALID_URL -#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP -#usr/lib/squid/errors/ru/ERR_NO_RELAY -#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/ru/ERR_READ_ERROR -#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT -#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/ru/ERR_TOO_BIG -#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/ru/ERR_UNSUP_REQ -#usr/lib/squid/errors/ru/ERR_URN_RESOLVE -#usr/lib/squid/errors/ru/ERR_WRITE_ERROR -#usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/ru/ERR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD +usr/lib/squid/errors/ru/ERR_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_DIR_LISTING +usr/lib/squid/errors/ru/ERR_DNS_FAIL +usr/lib/squid/errors/ru/ERR_ESI +usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED +usr/lib/squid/errors/ru/ERR_FTP_DISABLED +usr/lib/squid/errors/ru/ERR_FTP_FAILURE +usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/ru/ERR_ICAP_FAILURE +usr/lib/squid/errors/ru/ERR_INVALID_REQ +usr/lib/squid/errors/ru/ERR_INVALID_RESP +usr/lib/squid/errors/ru/ERR_INVALID_URL +usr/lib/squid/errors/ru/ERR_LIFETIME_EXP +usr/lib/squid/errors/ru/ERR_NO_RELAY +usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/ru/ERR_READ_ERROR +usr/lib/squid/errors/ru/ERR_READ_TIMEOUT +usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN +usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE +usr/lib/squid/errors/ru/ERR_TOO_BIG +usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/ru/ERR_UNSUP_REQ +usr/lib/squid/errors/ru/ERR_URN_RESOLVE +usr/lib/squid/errors/ru/ERR_WRITE_ERROR +usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk #usr/lib/squid/errors/sk-sk #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED diff --git a/lfs/squid b/lfs/squid index 6b71f0d..610154b 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.16 +VER = 3.1.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261 +$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 447dfa508d9669312449baa763d4be17677594f0
by git＠ipfire.org 18 Dec '11

18 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 447dfa508d9669312449baa763d4be17677594f0 (commit) from 3f18f99624664607023ef4ba505c281faa3a48e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 447dfa508d9669312449baa763d4be17677594f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 18 12:20:29 2011 +0100 core54: fix build on arm. ----------------------------------------------------------------------- Summary of changes: .../core/54/filelists/armv5tel/intelnet-modules | 6 ++++++ .../core/54/filelists/{ => i586}/intelnet-modules | 0 2 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 config/rootfiles/core/54/filelists/armv5tel/intelnet-modules rename config/rootfiles/core/54/filelists/{ => i586}/intelnet-modules (100%) Difference in files: diff --git a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules new file mode 100644 index 0000000..83d1e8b --- /dev/null +++ b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules @@ -0,0 +1,6 @@ +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/i586/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules new file mode 100644 index 0000000..5e3439d --- /dev/null +++ b/config/rootfiles/core/54/filelists/i586/intelnet-modules @@ -0,0 +1,9 @@ +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/intelnet-modules deleted file mode 100644 index 5e3439d..0000000 --- a/config/rootfiles/core/54/filelists/intelnet-modules +++ /dev/null @@ -1,9 +0,0 @@ -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko -lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4fb11761280f5d845ae0003a0124ef5490c9d643
by git＠ipfire.org 17 Dec '11

17 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 4fb11761280f5d845ae0003a0124ef5490c9d643 (commit) from 9507da1155fc38b123e29da356e41f630f6ebf29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4fb11761280f5d845ae0003a0124ef5490c9d643 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 17 14:12:35 2011 +0100 glibc: Update to 2.14.1. Enable linking to nss. ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 18 +- glibc/patches/glibc-fedora.patch | 1124 +++++++++++++++++--------------------- 2 files changed, 505 insertions(+), 637 deletions(-) Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 88ceb39..a451dee 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.14 -release = 5 +version = 2.14.1 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -41,6 +41,7 @@ build kernel-headers>=%{OPTIMIZED_KERNEL} libcap-devel libselinux-devel + nss-devel texinfo end @@ -68,11 +69,6 @@ build # Apply the patches. %{MACRO_PATCHES} - if [ "%{DISTRO_ARCH}" = "armv5tel" ]; then - sed -i configure \ - -e "s/libc_cv_gcc_static_libgcc=-static-libgcc/libc_cv_gcc_static_libgcc=/" - fi - # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is # unknown whether this is a bash bug or a Glibc problem. Disable # installation of this locale in order to avoid the problem. @@ -149,7 +145,6 @@ build configure_options = \ --build=%{DISTRO_BUILDTARGET} \ - --host=%{DISTRO_BUILDTARGET} \ --prefix=/usr \ --libexecdir=/usr/lib/glibc \ --disable-profile \ @@ -157,12 +152,9 @@ build --enable-kernel=%{OPTIMIZED_KERNEL} \ --with-selinux \ --disable-werror \ - --enable-bind-now \ - --enable-__thread \ - --enable-tls \ --enable-experimental-malloc \ - --with-gd \ - --with-nss-crypt + --enable-bind-now \ + --enable-nss-crypt if "%{DISTRO_ARCH}" == "armv5tel" # Disable hardware FP for ARM. diff --git a/glibc/patches/glibc-fedora.patch b/glibc/patches/glibc-fedora.patch index ff7de11..ac1e0a5 100644 --- a/glibc/patches/glibc-fedora.patch +++ b/glibc/patches/glibc-fedora.patch @@ -1,27 +1,32 @@ ---- glibc-2.14/ChangeLog -+++ glibc-2.14-2/ChangeLog -@@ -1,3 +1,8 @@ -+2011-05-31 Andreas Schwab <schwab(a)redhat.com> +--- glibc-2.14.1/ChangeLog ++++ glibc-2.14.1-2/ChangeLog +@@ -200,6 +200,14 @@ + * malloc/memusage.sh: Fix quoting in message. + * debug/xtrace.sh: Likewise. + ++2011-06-28 Andreas Schwab <schwab(a)redhat.com> ++ ++ * iconvdata/gb18030.c: Update tables. ++ (BODY for FROM_LOOP): Handle non-BMP characters specially. + -+ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced -+ memory. Use alloca_account. Fix memory leak when retrying. ++ * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr ++ to determine canonical name. + - 2011-05-31 Ulrich Drepper <drepper(a)gmail.com> + 2011-06-27 Andreas Schwab <schwab(a)redhat.com> - * version.h (RELEASE): Bump for 2.14 release. -@@ -10,11 +15,6 @@ - * po/Makefile (po-sed-cmd): Add ksh to extensions. - (libc.pot): Work around missing support for .ksh extension in xgettext. + * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP +@@ -215,6 +223,10 @@ + * sysdeps/posix/getaddrinfo.c (gaih_inet): When looking up only IPv6 + addresses using gethostbyname4_r ignore IPv4 addresses. -- [BZ #12684] -- * resolv/res_send.c (__libc_res_nsend): Only go to the next name server -- if both request failed. -- (send_dg): In case of server errors clear resplen or *resplen2. -- - [BZ #12454] - * elf/dl-deps.c (_dl_map_object_deps): Run initializer sorting only - when there are multiple maps. -@@ -400,6 +400,13 @@ ++2011-06-21 Andreas Schwab <schwab(a)redhat.com> ++ ++ * iconvdata/gb18030.c: Regenerate tables. ++ + 2011-06-15 Ulrich Drepper <drepper(a)gmail.com> + + * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch. We +@@ -692,6 +704,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file. @@ -35,7 +40,21 @@ 2011-05-12 Ulrich Drepper <drepper(a)gmail.com> [BZ #12511] -@@ -921,6 +928,31 @@ +@@ -969,13 +988,6 @@ + * stdlib/bug-getcontext.c: New file. + * stdlib/Makefile: Add rules to build and run bug-getcontext. + +-2011-04-13 Andreas Krebbel <Andreas.Krebbel(a)de.ibm.com> +- +- * sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109 +- instructions into .machine "z9-109". +- * sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise. +- * sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise. +- + 2011-04-11 Andreas Krebbel <Andreas.Krebbel(a)de.ibm.com> + + * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes +@@ -1213,6 +1225,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export. @@ -67,7 +86,7 @@ 2011-03-22 Ulrich Drepper <drepper(a)gmail.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -981,6 +1013,16 @@ +@@ -1273,6 +1310,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start. @@ -84,7 +103,7 @@ 2011-03-06 Ulrich Drepper <drepper(a)gmail.com> * elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -1035,12 +1077,6 @@ +@@ -1327,12 +1374,6 @@ * elf/noload.c: Include <memcheck.h>. (main): Call mtrace. Close all opened handles. @@ -97,7 +116,7 @@ 2011-02-22 Samuel Thibault <samuel.thibault(a)ens-lyon.org> Fix __if_freereq crash: Unlike the generic version which uses free, -@@ -1197,6 +1233,12 @@ +@@ -1489,6 +1530,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -110,7 +129,7 @@ 2011-01-19 Ulrich Drepper <drepper(a)gmail.com> [BZ #11724] -@@ -1884,6 +1926,29 @@ +@@ -2176,6 +2223,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. @@ -134,13 +153,10 @@ + * nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen + as size_t. + -+ * sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing -+ backslash. -+ 2010-09-24 Petr Baudis <pasky(a)suse.cz> * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -2676,6 +2741,32 @@ +@@ -2968,6 +3035,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -151,21 +167,6 @@ + * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. + * resource/getrlimit.c: Likewise. + -+2010-06-28 Andreas Schwab <schwab(a)redhat.com> -+ -+ * allocatestack.c (setxid_mark_thread): Ensure that the exiting -+ thread is woken up. -+ -+ * elf/Makefile: Add rules to build and run unload8 test. -+ * elf/unload8.c: New file. -+ * elf/unload8mod1.c: New file. -+ * elf/unload8mod1x.c: New file. -+ * elf/unload8mod2.c: New file. -+ * elf/unload8mod3.c: New file. -+ -+ * elf/dl-close.c (_dl_close_worker): Reset private search list if -+ it wasn't used. -+ +2010-06-21 Andreas Schwab <schwab(a)redhat.com> + + * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler. @@ -173,7 +174,7 @@ 2010-06-07 Andreas Schwab <schwab(a)redhat.com> * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -2728,6 +2819,24 @@ +@@ -3020,6 +3098,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -198,8 +199,8 @@ 2010-05-28 Luis Machado <luisgpm(a)br.ibm.com> * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14/ChangeLog.15 -+++ glibc-2.14-2/ChangeLog.15 +--- glibc-2.14.1/ChangeLog.15 ++++ glibc-2.14.1-2/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek <jakub(a)redhat.com> @@ -265,8 +266,8 @@ 2004-08-30 Roland McGrath <roland(a)frob.com> * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14/ChangeLog.16 -+++ glibc-2.14-2/ChangeLog.16 +--- glibc-2.14.1/ChangeLog.16 ++++ glibc-2.14.1-2/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -289,8 +290,8 @@ 2006-01-19 Thomas Schwinge <tschwinge(a)gnu.org> * libio/genops.c: Include <stdbool.h>. ---- glibc-2.14/ChangeLog.17 -+++ glibc-2.14-2/ChangeLog.17 +--- glibc-2.14.1/ChangeLog.17 ++++ glibc-2.14.1-2/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -369,8 +370,8 @@ 2006-12-09 Ulrich Drepper <drepper(a)redhat.com> [BZ #3632] ---- glibc-2.14/Makeconfig -+++ glibc-2.14-2/Makeconfig +--- glibc-2.14.1/Makeconfig ++++ glibc-2.14.1-2/Makeconfig @@ -791,12 +791,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -387,16 +388,12 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14/NEWS -+++ glibc-2.14-2/NEWS -@@ -16,19 +16,9 @@ Version 2.14 - 12393, 12420, 12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, - 12509, 12510, 12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, - 12587, 12597, 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, -- 12660, 12671, 12681, 12684, 12685, 12711, 12713, 12714, 12717, 12723, -- 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, -- 12795, 12811, 12813, 12814 -- +--- glibc-2.14.1/NEWS ++++ glibc-2.14.1-2/NEWS +@@ -27,16 +27,6 @@ Version 2.14 + 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, + 12795, 12811, 12813, 12814, 12841 + -* The RPC implementation in libc is obsoleted. Old programs keep working - but new programs cannot be linked with the routines in libc anymore. - Programs in need of RPC functionality must be linked against TI-RPC. @@ -406,14 +403,12 @@ - programs using RPC functions without referencing the TI-RPC library and the - removal of the RPC headers from the glibc headers. - Implemented by Ulrich Drepper. -+ 12660, 12671, 12681, 12685, 12711, 12713, 12714, 12717, 12723, 12724, -+ 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, -+ 12811, 12813, 12814 - +- * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14/config.h.in -+++ glibc-2.14-2/config.h.in + +--- glibc-2.14.1/config.h.in ++++ glibc-2.14.1-2/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -424,8 +419,8 @@ /* */ ---- glibc-2.14/configure -+++ glibc-2.14-2/configure +--- glibc-2.14.1/configure ++++ glibc-2.14.1-2/configure @@ -784,6 +784,7 @@ enable_all_warnings enable_multi_arch enable_experimental_malloc @@ -494,8 +489,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14/configure.in -+++ glibc-2.14-2/configure.in +--- glibc-2.14.1/configure.in ++++ glibc-2.14.1-2/configure.in @@ -316,6 +316,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -526,8 +521,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14/csu/Makefile -+++ glibc-2.14-2/csu/Makefile +--- glibc-2.14.1/csu/Makefile ++++ glibc-2.14.1-2/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -538,8 +533,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.14/csu/elf-init.c -+++ glibc-2.14-2/csu/elf-init.c +--- glibc-2.14.1/csu/elf-init.c ++++ glibc-2.14.1-2/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -564,8 +559,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14/debug/tst-chk1.c -+++ glibc-2.14-2/debug/tst-chk1.c +--- glibc-2.14.1/debug/tst-chk1.c ++++ glibc-2.14.1-2/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -594,17 +589,9 @@ # define O 0 # else # define O 1 ---- glibc-2.14/elf/Makefile -+++ glibc-2.14-2/elf/Makefile -@@ -90,6 +90,7 @@ distribute := rtld-Rules \ - unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ - unload6mod1.c unload6mod2.c unload6mod3.c \ - unload7mod1.c unload7mod2.c \ -+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ - tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ - tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ - tst-auditmod4a.c tst-auditmod4b.c \ -@@ -133,6 +134,7 @@ include ../Makeconfig +--- glibc-2.14.1/elf/Makefile ++++ glibc-2.14.1-2/elf/Makefile +@@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc shared-only-routines += unwind-dw2-fde-glibc @@ -612,24 +599,7 @@ endif before-compile = $(objpfx)trusted-dirs.h -@@ -221,7 +223,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ - tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ - tst-dlmodcount tst-dlopenrpath tst-deep1 \ - tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ -- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ -+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ - tst-audit1 tst-audit2 \ - tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ -@@ -279,6 +281,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ - unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ - unload6mod1 unload6mod2 unload6mod3 \ - unload7mod1 unload7mod2 \ -+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ - order2mod1 order2mod2 order2mod3 order2mod4 \ - tst-unique1mod1 tst-unique1mod2 \ - tst-unique2mod1 tst-unique2mod2 \ -@@ -500,7 +503,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +@@ -504,7 +505,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) @@ -639,28 +609,8 @@ test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) -@@ -568,6 +572,9 @@ $(objpfx)unload6mod2.so: $(libdl) - $(objpfx)unload6mod3.so: $(libdl) - $(objpfx)unload7mod1.so: $(libdl) - $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so -+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so -+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so -+$(objpfx)unload8mod3.so: $(libdl) - $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so - $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so - $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -881,6 +888,9 @@ $(objpfx)unload7: $(libdl) - $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so - unload7-ENV = MALLOC_PERTURB_=85 - -+$(objpfx)unload8: $(libdl) -+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -+ - ifdef libdl - $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a - $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so ---- glibc-2.14/elf/dl-close.c -+++ glibc-2.14-2/elf/dl-close.c +--- glibc-2.14.1/elf/dl-close.c ++++ glibc-2.14.1-2/elf/dl-close.c @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) if (map->l_direct_opencount > 0 || map->l_type != lt_loaded || dl_close_state != not_pending) @@ -681,22 +631,8 @@ /* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -@@ -430,6 +421,13 @@ _dl_close_worker (struct link_map *map) - - imap->l_scope_max = new_size; - } -+ else if (new_list != NULL) -+ { -+ /* We didn't change the scope array, so reset the search -+ list. */ -+ imap->l_searchlist.r_list = NULL; -+ imap->l_searchlist.r_nlist = 0; -+ } - - /* The loader is gone, so mark the object as not having one. - Note: l_idx != IDX_STILL_USED -> object will be removed. */ ---- glibc-2.14/elf/dl-deps.c -+++ glibc-2.14-2/elf/dl-deps.c +--- glibc-2.14.1/elf/dl-deps.c ++++ glibc-2.14.1-2/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -705,18 +641,7 @@ } /* If we have no auxiliary objects just go on to the next map. */ -@@ -491,10 +492,6 @@ _dl_map_object_deps (struct link_map *map, - if (errno == 0 && errno_saved != 0) - __set_errno (errno_saved); - -- if (errno_reason) -- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -- NULL, errstring); -- - struct link_map **old_l_initfini = NULL; - if (map->l_initfini != NULL && map->l_type == lt_loaded) - { -@@ -681,6 +678,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -678,6 +679,7 @@ Filters not supported with LD_TRACE_PRELINKING")); l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -724,19 +649,17 @@ if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -689,5 +687,9 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -686,7 +688,7 @@ Filters not supported with LD_TRACE_PRELINKING")); _dl_scope_free (old_l_reldeps); } if (old_l_initfini != NULL) - map->l_orig_initfini = old_l_initfini; + _dl_scope_free (old_l_initfini); -+ -+ if (errno_reason) -+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -+ NULL, errstring); - } ---- glibc-2.14/elf/dl-init.c -+++ glibc-2.14-2/elf/dl-init.c + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +--- glibc-2.14.1/elf/dl-init.c ++++ glibc-2.14.1-2/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -759,8 +682,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14/elf/dl-libc.c -+++ glibc-2.14-2/elf/dl-libc.c +--- glibc-2.14.1/elf/dl-libc.c ++++ glibc-2.14.1-2/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -787,8 +710,8 @@ } if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14/elf/dl-load.c -+++ glibc-2.14-2/elf/dl-load.c +--- glibc-2.14.1/elf/dl-load.c ++++ glibc-2.14.1-2/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len) @@ -868,8 +791,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14/elf/dl-support.c -+++ glibc-2.14-2/elf/dl-support.c +--- glibc-2.14.1/elf/dl-support.c ++++ glibc-2.14.1-2/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -881,8 +804,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14/elf/ldconfig.c -+++ glibc-2.14-2/elf/ldconfig.c +--- glibc-2.14.1/elf/ldconfig.c ++++ glibc-2.14.1-2/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void) @@ -964,8 +887,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14/elf/ldd.bash.in -+++ glibc-2.14-2/elf/ldd.bash.in +--- glibc-2.14.1/elf/ldd.bash.in ++++ glibc-2.14.1-2/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2 fi done @@ -994,8 +917,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14/elf/rtld-Rules -+++ glibc-2.14-2/elf/rtld-Rules +--- glibc-2.14.1/elf/rtld-Rules ++++ glibc-2.14.1-2/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. @@ -1013,8 +936,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif ---- glibc-2.14/elf/rtld.c -+++ glibc-2.14-2/elf/rtld.c +--- glibc-2.14.1/elf/rtld.c ++++ glibc-2.14.1-2/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -1058,114 +981,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14/elf/unload8.c -+++ glibc-2.14-2/elf/unload8.c -@@ -0,0 +1,33 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+ -+int -+main (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod1.so failed"); -+ return 1; -+ } -+ -+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); -+ if (h2 == NULL) -+ { -+ puts ("dlopen unload8mod1x.so failed"); -+ return 1; -+ } -+ dlclose (h2); -+ -+ int (*mod1) (void) = dlsym (h, "mod1"); -+ if (mod1 == NULL) -+ { -+ puts ("dlsym failed"); -+ return 1; -+ } -+ -+ mod1 (); -+ dlclose (h); -+ -+ return 0; -+} ---- glibc-2.14/elf/unload8mod1.c -+++ glibc-2.14-2/elf/unload8mod1.c -@@ -0,0 +1,7 @@ -+extern void mod2 (void); -+ -+void -+mod1 (void) -+{ -+ mod2 (); -+} ---- glibc-2.14/elf/unload8mod1x.c -+++ glibc-2.14-2/elf/unload8mod1x.c -@@ -0,0 +1 @@ -+int mod1x; ---- glibc-2.14/elf/unload8mod2.c -+++ glibc-2.14-2/elf/unload8mod2.c -@@ -0,0 +1,7 @@ -+extern void mod3 (void); -+ -+void -+mod2 (void) -+{ -+ mod3 (); -+} ---- glibc-2.14/elf/unload8mod3.c -+++ glibc-2.14-2/elf/unload8mod3.c -@@ -0,0 +1,27 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+void -+mod3_fini2 (void) -+{ -+} -+ -+void -+mod3_fini (void) -+{ -+ mod3_fini2 (); -+} -+ -+void -+mod3 (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod2.so failed"); -+ exit (1); -+ } -+ -+ atexit (mod3_fini); -+} ---- glibc-2.14/extra-lib.mk -+++ glibc-2.14-2/extra-lib.mk +--- glibc-2.14.1/extra-lib.mk ++++ glibc-2.14.1-2/extra-lib.mk @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif -CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) ---- glibc-2.14/include/bits/stdlib-ldbl.h -+++ glibc-2.14-2/include/bits/stdlib-ldbl.h +--- glibc-2.14.1/include/bits/stdlib-ldbl.h ++++ glibc-2.14.1-2/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include <stdlib/bits/stdlib-ldbl.h> ---- glibc-2.14/include/bits/wchar-ldbl.h -+++ glibc-2.14-2/include/bits/wchar-ldbl.h +--- glibc-2.14.1/include/bits/wchar-ldbl.h ++++ glibc-2.14.1-2/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include <wcsmbs/bits/wchar-ldbl.h> ---- glibc-2.14/include/features.h -+++ glibc-2.14-2/include/features.h +--- glibc-2.14.1/include/features.h ++++ glibc-2.14.1-2/include/features.h @@ -310,8 +310,13 @@ #endif @@ -1182,8 +1015,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14/include/libc-symbols.h -+++ glibc-2.14-2/include/libc-symbols.h +--- glibc-2.14.1/include/libc-symbols.h ++++ glibc-2.14.1-2/include/libc-symbols.h @@ -635,7 +635,7 @@ for linking") # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) @@ -1193,8 +1026,8 @@ # define libc_hidden_ver(local, name) hidden_ver (local, name) # define libc_hidden_data_def(name) hidden_data_def (name) # define libc_hidden_data_weak(name) hidden_data_weak (name) ---- glibc-2.14/include/link.h -+++ glibc-2.14-2/include/link.h +--- glibc-2.14.1/include/link.h ++++ glibc-2.14.1-2/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1223,8 +1056,8 @@ /* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.14/include/stap-probe.h -+++ glibc-2.14-2/include/stap-probe.h +--- glibc-2.14.1/include/stap-probe.h ++++ glibc-2.14.1-2/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap <sys/sdt.h> static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1366,16 +1199,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14/include/sys/resource.h -+++ glibc-2.14-2/include/sys/resource.h +--- glibc-2.14.1/include/sys/resource.h ++++ glibc-2.14.1-2/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.14/inet/Makefile -+++ glibc-2.14-2/inet/Makefile +--- glibc-2.14.1/inet/Makefile ++++ glibc-2.14.1-2/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -1385,8 +1218,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14/intl/locale.alias -+++ glibc-2.14-2/intl/locale.alias +--- glibc-2.14.1/intl/locale.alias ++++ glibc-2.14.1-2/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1396,8 +1229,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14/libio/stdio.h -+++ glibc-2.14-2/libio/stdio.h +--- glibc-2.14.1/libio/stdio.h ++++ glibc-2.14.1-2/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -1411,8 +1244,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14/locale/iso-4217.def -+++ glibc-2.14-2/locale/iso-4217.def +--- glibc-2.14.1/locale/iso-4217.def ++++ glibc-2.14.1-2/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1504,8 +1337,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14/locale/programs/locarchive.c -+++ glibc-2.14-2/locale/programs/locarchive.c +--- glibc-2.14.1/locale/programs/locarchive.c ++++ glibc-2.14.1-2/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -1564,8 +1397,22 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14/localedata/Makefile -+++ glibc-2.14-2/localedata/Makefile +--- glibc-2.14.1/localedata/ChangeLog ++++ glibc-2.14.1-2/localedata/ChangeLog +@@ -1,3 +1,11 @@ ++2011-06-28 Andreas Schwab <schwab(a)redhat.com> ++ ++ * charmaps/GB18030: Correct some entries. ++ ++2011-06-21 Andreas Schwab <schwab(a)redhat.com> ++ ++ * charmaps/GB18030: Readd lost characters. ++ + 2011-05-21 Ulrich Drepper <drepper(a)gmail.com> + + [BZ #12788] +--- glibc-2.14.1/localedata/Makefile ++++ glibc-2.14.1-2/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/$[^.]*$[^(a)]*$.*$/\1\2/'`; \ @@ -1574,8 +1421,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14/localedata/SUPPORTED -+++ glibc-2.14-2/localedata/SUPPORTED +--- glibc-2.14.1/localedata/SUPPORTED ++++ glibc-2.14.1-2/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1617,8 +1464,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14/localedata/locales/cy_GB -+++ glibc-2.14-2/localedata/locales/cy_GB +--- glibc-2.14.1/localedata/locales/cy_GB ++++ glibc-2.14.1-2/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/ d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>" @@ -1633,8 +1480,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.14/localedata/locales/en_GB -+++ glibc-2.14-2/localedata/locales/en_GB +--- glibc-2.14.1/localedata/locales/en_GB ++++ glibc-2.14.1-2/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" @@ -1646,8 +1493,8 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" ---- glibc-2.14/localedata/locales/no_NO -+++ glibc-2.14-2/localedata/locales/no_NO +--- glibc-2.14.1/localedata/locales/no_NO ++++ glibc-2.14.1-2/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1718,8 +1565,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14/localedata/locales/zh_TW -+++ glibc-2.14-2/localedata/locales/zh_TW +--- glibc-2.14.1/localedata/locales/zh_TW ++++ glibc-2.14.1-2/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1747,8 +1594,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14/login/programs/pt_chown.c -+++ glibc-2.14-2/login/programs/pt_chown.c +--- glibc-2.14.1/login/programs/pt_chown.c ++++ glibc-2.14.1-2/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include <string.h> #include <sys/stat.h> @@ -1790,8 +1637,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14/malloc/mcheck.c -+++ glibc-2.14-2/malloc/mcheck.c +--- glibc-2.14.1/malloc/mcheck.c ++++ glibc-2.14.1-2/malloc/mcheck.c @@ -25,10 +25,26 @@ # include <mcheck.h> # include <stdint.h> @@ -1868,8 +1715,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14/manual/libc.texinfo -+++ glibc-2.14-2/manual/libc.texinfo +--- glibc-2.14.1/manual/libc.texinfo ++++ glibc-2.14.1-2/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1879,8 +1726,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14/misc/sys/cdefs.h -+++ glibc-2.14-2/misc/sys/cdefs.h +--- glibc-2.14.1/misc/sys/cdefs.h ++++ glibc-2.14.1-2/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1924,8 +1771,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14/nis/Makefile -+++ glibc-2.14-2/nis/Makefile +--- glibc-2.14.1/nis/Makefile ++++ glibc-2.14.1-2/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis aux := nis_hash @@ -1947,8 +1794,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14/nis/nss -+++ glibc-2.14-2/nis/nss +--- glibc-2.14.1/nis/nss ++++ glibc-2.14.1-2/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -1958,9 +1805,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14/nptl/ChangeLog -+++ glibc-2.14-2/nptl/ChangeLog -@@ -10,6 +10,51 @@ +--- glibc-2.14.1/nptl/ChangeLog ++++ glibc-2.14.1-2/nptl/ChangeLog +@@ -45,6 +45,51 @@ clearing memory. Patch partly by Robert Rex <robert.rex(a)exasol.com>. @@ -2012,7 +1859,7 @@ 2011-01-19 Roland McGrath <roland(a)redhat.com> * pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4739,6 +4784,11 @@ +@@ -4774,6 +4819,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -2024,7 +1871,7 @@ 2004-09-02 Ulrich Drepper <drepper(a)redhat.com> * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6813,6 +6863,11 @@ +@@ -6848,6 +6898,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -2036,8 +1883,8 @@ 2003-07-25 Jakub Jelinek <jakub(a)redhat.com> * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14-2/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14.1/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.1-2/nptl/DESIGN-systemtap-probes.txt @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes +that are not fired at run time have close to zero overhead. @@ -2128,8 +1975,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14/nptl/Makefile -+++ glibc-2.14-2/nptl/Makefile +--- glibc-2.14.1/nptl/Makefile ++++ glibc-2.14.1-2/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2162,8 +2009,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14/nptl/Versions -+++ glibc-2.14-2/nptl/Versions +--- glibc-2.14.1/nptl/Versions ++++ glibc-2.14.1-2/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2172,29 +2019,9 @@ } } ---- glibc-2.14/nptl/allocatestack.c -+++ glibc-2.14-2/nptl/allocatestack.c -@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) - - /* If the thread is exiting right now, ignore it. */ - if ((ch & EXITING_BITMASK) != 0) -- return; -+ { -+ /* Release the futex if there is no other setxid in -+ progress. */ -+ if ((ch & SETXID_BITMASK) == 0) -+ { -+ t->setxid_futex = 1; -+ lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE); -+ } -+ return; -+ } - } - while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, - ch | SETXID_BITMASK, ch)); ---- glibc-2.14/nptl/nptl-init.c -+++ glibc-2.14-2/nptl/nptl-init.c -@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void) +--- glibc-2.14.1/nptl/nptl-init.c ++++ glibc-2.14.1-2/nptl/nptl-init.c +@@ -415,7 +415,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ struct rlimit limit; @@ -2203,8 +2030,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14/nptl/pthread_cond_broadcast.c -+++ glibc-2.14-2/nptl/pthread_cond_broadcast.c +--- glibc-2.14.1/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.1-2/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2222,8 +2049,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14/nptl/pthread_cond_destroy.c -+++ glibc-2.14-2/nptl/pthread_cond_destroy.c +--- glibc-2.14.1/nptl/pthread_cond_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include <errno.h> #include <shlib-compat.h> @@ -2241,8 +2068,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14/nptl/pthread_cond_init.c -+++ glibc-2.14-2/nptl/pthread_cond_init.c +--- glibc-2.14.1/nptl/pthread_cond_init.c ++++ glibc-2.14.1-2/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@ #include <shlib-compat.h> @@ -2260,8 +2087,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14/nptl/pthread_cond_signal.c -+++ glibc-2.14-2/nptl/pthread_cond_signal.c +--- glibc-2.14.1/nptl/pthread_cond_signal.c ++++ glibc-2.14.1-2/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@ #include <shlib-compat.h> @@ -2279,8 +2106,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14/nptl/pthread_cond_wait.c -+++ glibc-2.14-2/nptl/pthread_cond_wait.c +--- glibc-2.14.1/nptl/pthread_cond_wait.c ++++ glibc-2.14.1-2/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include <pthreadP.h> @@ -2298,8 +2125,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared); ---- glibc-2.14/nptl/pthread_create.c -+++ glibc-2.14-2/nptl/pthread_create.c +--- glibc-2.14.1/nptl/pthread_create.c ++++ glibc-2.14.1-2/nptl/pthread_create.c @@ -31,6 +31,8 @@ #include <shlib-compat.h> @@ -2327,8 +2154,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14/nptl/pthread_join.c -+++ glibc-2.14-2/nptl/pthread_join.c +--- glibc-2.14.1/nptl/pthread_join.c ++++ glibc-2.14.1-2/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include <atomic.h> #include "pthreadP.h" @@ -2355,8 +2182,8 @@ + return result; } ---- glibc-2.14/nptl/pthread_mutex_destroy.c -+++ glibc-2.14-2/nptl/pthread_mutex_destroy.c +--- glibc-2.14.1/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include <errno.h> #include "pthreadP.h" @@ -2373,8 +2200,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14/nptl/pthread_mutex_init.c -+++ glibc-2.14-2/nptl/pthread_mutex_init.c +--- glibc-2.14.1/nptl/pthread_mutex_init.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include <kernel-features.h> #include "pthreadP.h" @@ -2393,8 +2220,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14/nptl/pthread_mutex_lock.c -+++ glibc-2.14-2/nptl/pthread_mutex_lock.c +--- glibc-2.14.1/nptl/pthread_mutex_lock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include <not-cancel.h> #include "pthreadP.h" @@ -2431,8 +2258,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14-2/nptl/pthread_mutex_timedlock.c +--- glibc-2.14.1/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include <lowlevellock.h> #include <not-cancel.h> @@ -2487,8 +2314,8 @@ } out: ---- glibc-2.14/nptl/pthread_mutex_unlock.c -+++ glibc-2.14-2/nptl/pthread_mutex_unlock.c +--- glibc-2.14.1/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include "pthreadP.h" @@ -2525,8 +2352,8 @@ return 0; } ---- glibc-2.14/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14-2/nptl/pthread_rwlock_destroy.c +--- glibc-2.14.1/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2543,8 +2370,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2571,8 +2398,8 @@ break; } ---- glibc-2.14/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_unlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2588,8 +2415,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2616,8 +2443,8 @@ break; } ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -2626,8 +2453,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2635,8 +2462,8 @@ + __uname; + } +} ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2656,8 +2483,8 @@ ENTER_KERNEL 2: movl %edx, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2675,8 +2502,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2695,8 +2522,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2715,8 +2542,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2734,8 +2561,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2753,8 +2580,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2772,8 +2599,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2791,8 +2618,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -2802,8 +2629,8 @@ cp = u.uts.version; else { ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next <kernel-features.h> + @@ -2811,8 +2638,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2842,8 +2669,8 @@ syscall 2: movl %edx, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2861,8 +2688,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2881,8 +2708,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include <pthread-pi-defines.h> #include <kernel-features.h> @@ -2900,8 +2727,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include <lowlevelcond.h> #include <pthread-pi-defines.h> @@ -2919,8 +2746,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include <lowlevelcond.h> #include <tcb-offsets.h> @@ -2938,8 +2765,8 @@ cmpq $-1, dep_mutex(%rdi) /* Prepare structure passed to cancellation handler. */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2959,8 +2786,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2980,8 +2807,8 @@ xorq %r10, %r10 /* Get the lock. */ ---- glibc-2.14/nscd/nscd.conf -+++ glibc-2.14-2/nscd/nscd.conf +--- glibc-2.14.1/nscd/nscd.conf ++++ glibc-2.14.1-2/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2991,8 +2818,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14/nscd/nscd.init -+++ glibc-2.14-2/nscd/nscd.init +--- glibc-2.14.1/nscd/nscd.init ++++ glibc-2.14.1-2/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -3069,54 +2896,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14/nscd/nscd_getserv_r.c -+++ glibc-2.14-2/nscd/nscd_getserv_r.c -@@ -124,6 +124,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - s_name = (char *) (&found->data[0].servdata + 1); - serv_resp = found->data[0].servdata; - s_proto = s_name + serv_resp.s_name_len; -+ alloca_aliases_len = 1; - aliases_len = (uint32_t *) (s_proto + serv_resp.s_proto_len); - aliases_list = ((char *) aliases_len - + serv_resp.s_aliases_cnt * sizeof (uint32_t)); -@@ -154,7 +155,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - + (serv_resp.s_aliases_cnt - * sizeof (uint32_t))); - if (alloca_aliases_len) -- tmp = __alloca (serv_resp.s_aliases_cnt * sizeof (uint32_t)); -+ tmp = alloca_account (serv_resp.s_aliases_cnt -+ * sizeof (uint32_t), -+ alloca_used); - else - { - tmp = malloc (serv_resp.s_aliases_cnt * sizeof (uint32_t)); -@@ -249,8 +252,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - + (serv_resp.s_aliases_cnt - * sizeof (uint32_t))); - if (alloca_aliases_len) -- aliases_len = alloca (serv_resp.s_aliases_cnt -- * sizeof (uint32_t)); -+ aliases_len = alloca_account (serv_resp.s_aliases_cnt -+ * sizeof (uint32_t), -+ alloca_used); - else - { - aliases_len = malloc (serv_resp.s_aliases_cnt -@@ -368,7 +372,11 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - } - - if (retval != -1) -- goto retry; -+ { -+ if (!alloca_aliases_len) -+ free (aliases_len); -+ goto retry; -+ } - } - - if (!alloca_aliases_len) ---- glibc-2.14/nss/Makefile -+++ glibc-2.14-2/nss/Makefile +--- glibc-2.14.1/nss/Makefile ++++ glibc-2.14.1-2/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -3125,8 +2906,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14/nss/nss_files/files-XXX.c -+++ glibc-2.14-2/nss/nss_files/files-XXX.c +--- glibc-2.14.1/nss/nss_files/files-XXX.c ++++ glibc-2.14.1-2/nss/nss_files/files-XXX.c @@ -1,5 +1,5 @@ /* Common code for file-based databases in nss_files module. - Copyright (C) 1996-1999,2001,2002,2004,2007,2008 @@ -3143,8 +2924,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.14/posix/Makefile -+++ glibc-2.14-2/posix/Makefile +--- glibc-2.14.1/posix/Makefile ++++ glibc-2.14.1-2/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $(a)/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -3162,11 +2943,11 @@ -endif +$(objpfx)getconf.speclist: getconf.speclist.h + $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \ -+ | sed -n -e '/START_OF_STRINGS/,$${/$POSIX_V[67]\|_XBS5$_/{s/^[^"]*"//;s/".*$$//;p}}' \ ++ | sed -n -e '/START_OF_STRINGS/,$${/$POSIX_V[67]\|XBS5$_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14/posix/gai.conf -+++ glibc-2.14-2/posix/gai.conf +--- glibc-2.14.1/posix/gai.conf ++++ glibc-2.14.1-2/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence <mask> <value> @@ -3191,8 +2972,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14/posix/getconf.speclist.h -+++ glibc-2.14-2/posix/getconf.speclist.h +--- glibc-2.14.1/posix/getconf.speclist.h ++++ glibc-2.14.1-2/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include <unistd.h> +const char *START_OF_STRINGS = @@ -3233,8 +3014,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14/posix/regcomp.c -+++ glibc-2.14-2/posix/regcomp.c +--- glibc-2.14.1/posix/regcomp.c ++++ glibc-2.14.1-2/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, /* Local function for parse_bracket_exp used in _LIBC environement. @@ -3366,8 +3147,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14/resolv/Makefile -+++ glibc-2.14-2/resolv/Makefile +--- glibc-2.14.1/resolv/Makefile ++++ glibc-2.14.1-2/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -3376,53 +3157,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14/resolv/res_send.c -+++ glibc-2.14-2/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ send_dg(res_state statp, - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; -@@ -1348,7 +1344,7 @@ send_dg(res_state statp, - goto err_out; - } - else { -- /* poll should not have returned > 0 in this case. */ -+ /* poll should not have returned > 0 in this case. */ - abort (); - } - } ---- glibc-2.14/resource/getrlimit.c -+++ glibc-2.14-2/resource/getrlimit.c +--- glibc-2.14.1/resource/getrlimit.c ++++ glibc-2.14.1-2/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3431,8 +3167,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.14/scripts/check-local-headers.sh -+++ glibc-2.14-2/scripts/check-local-headers.sh +--- glibc-2.14.1/scripts/check-local-headers.sh ++++ glibc-2.14.1-2/scripts/check-local-headers.sh @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" | fgrep -v "$includedir/linux" | fgrep -v "$includedir/selinux" | @@ -3442,8 +3178,8 @@ fgrep -v "$includedir/gd" | fgrep -v "$includedir/nss3"; then # If we found a match something is wrong. ---- glibc-2.14/stdio-common/vfprintf.c -+++ glibc-2.14-2/stdio-common/vfprintf.c +--- glibc-2.14.1/stdio-common/vfprintf.c ++++ glibc-2.14.1-2/stdio-common/vfprintf.c @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -3489,8 +3225,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14/streams/Makefile -+++ glibc-2.14-2/streams/Makefile +--- glibc-2.14.1/streams/Makefile ++++ glibc-2.14.1-2/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3500,8 +3236,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.14/sunrpc/Makefile -+++ glibc-2.14-2/sunrpc/Makefile +--- glibc-2.14.1/sunrpc/Makefile ++++ glibc-2.14.1-2/sunrpc/Makefile @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ des_crypt.h) headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ @@ -3522,8 +3258,8 @@ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so ---- glibc-2.14/sysdeps/generic/dl-cache.h -+++ glibc-2.14-2/sysdeps/generic/dl-cache.h +--- glibc-2.14.1/sysdeps/generic/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3539,8 +3275,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-2.14/sysdeps/i386/Makefile -+++ glibc-2.14-2/sysdeps/i386/Makefile +--- glibc-2.14.1/sysdeps/i386/Makefile ++++ glibc-2.14.1-2/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3565,8 +3301,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14/sysdeps/i386/__longjmp.S -+++ glibc-2.14-2/sysdeps/i386/__longjmp.S +--- glibc-2.14.1/sysdeps/i386/__longjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3613,8 +3349,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14-2/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14.1/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/bsd-_setjmp.S @@ -1,5 +1,6 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. - Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc. @@ -3639,8 +3375,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14-2/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14.1/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,6 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc. @@ -3665,8 +3401,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/i386/i686/Makefile -+++ glibc-2.14-2/sysdeps/i386/i686/Makefile +--- glibc-2.14.1/sysdeps/i386/i686/Makefile ++++ glibc-2.14.1-2/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3687,21 +3423,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.14-2/sysdeps/i386/i686/multiarch/strspn.S -@@ -76,8 +76,8 @@ END(strspn) - # define ENTRY(name) \ - .type __strspn_ia32, @function; \ - .globl __strspn_ia32; \ -- .p2align 4 -- __strspn_ia32: cfi_startproc; \ -+ .p2align 4; \ -+__strspn_ia32: cfi_startproc; \ - CALL_MCOUNT - # undef END - # define END(name) \ ---- glibc-2.14/sysdeps/i386/setjmp.S -+++ glibc-2.14-2/sysdeps/i386/setjmp.S +--- glibc-2.14.1/sysdeps/i386/setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3725,8 +3448,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/ia64/Makefile -+++ glibc-2.14-2/sysdeps/ia64/Makefile +--- glibc-2.14.1/sysdeps/ia64/Makefile ++++ glibc-2.14.1-2/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -3738,8 +3461,8 @@ endif endif ---- glibc-2.14/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14-2/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14.1/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.1-2/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -4091,8 +3814,8 @@ - .symver ___multi3, __multi3(a)GLIBC_2.2 - -#endif ---- glibc-2.14/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14-2/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14.1/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.1-2/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -4178,17 +3901,128 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14-2/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14.1/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.1-2/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.14/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14-2/sysdeps/posix/getaddrinfo.c -@@ -1335,10 +1335,12 @@ static const struct scopeentry +--- glibc-2.14.1/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.1-2/sysdeps/posix/getaddrinfo.c +@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, + + /* If we do not have to look for IPv6 addresses, use + the simple, old functions, which do not support +- IPv6 scope ids. */ +- if (req->ai_family == AF_INET) ++ IPv6 scope ids, nor retrieving the canonical name. */ ++ if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0) + { + int family = req->ai_family; + size_t tmpbuflen = 512; +@@ -1115,68 +1115,10 @@ gaih_inet (const char *name, const struct gaih_service *service, + /* Only the first entry gets the canonical name. */ + if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) + { +- char *tmpbuf2 = NULL; +- bool malloc_tmpbuf2 = false; +- + if (canon == NULL) +- { +- struct hostent *h = NULL; +- int herrno; +- struct hostent th; +- size_t tmpbuf2len = 512; +- +- do +- { +- if (__libc_use_alloca (alloca_used + 2 * tmpbuf2len)) +- tmpbuf2 = extend_alloca_account (tmpbuf2, tmpbuf2len, +- tmpbuf2len * 2, +- alloca_used); +- else +- { +- char *newp = realloc (malloc_tmpbuf2 ? tmpbuf2 : NULL, +- 2 * tmpbuf2len); +- if (newp == NULL) +- { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- result = -EAI_MEMORY; +- goto free_and_return; +- } +- +- tmpbuf2 = newp; +- tmpbuf2len = 2 * tmpbuf2len; +- malloc_tmpbuf2 = true; +- } +- +- rc = __gethostbyaddr_r (at2->addr, +- ((at2->family == AF_INET6) +- ? sizeof (struct in6_addr) +- : sizeof (struct in_addr)), +- at2->family, &th, tmpbuf2, +- tmpbuf2len, &h, &herrno); +- } +- while (rc == ERANGE && herrno == NETDB_INTERNAL); +- +- if (rc != 0 && herrno == NETDB_INTERNAL) +- { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- +- __set_h_errno (herrno); +- result = -EAI_SYSTEM; +- goto free_and_return; +- } +- +- if (h != NULL) +- canon = h->h_name; +- else +- { +- assert (orig_name != NULL); +- /* If the canonical name cannot be determined, use +- the passed in string. */ +- canon = orig_name; +- } +- } ++ /* If the canonical name cannot be determined, use ++ the passed in string. */ ++ canon = orig_name; + + #ifdef HAVE_LIBIDN + if (req->ai_flags & AI_CANONIDN) +@@ -1191,9 +1133,6 @@ gaih_inet (const char *name, const struct gaih_service *service, + int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); + if (rc != IDNA_SUCCESS) + { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- + if (rc == IDNA_MALLOC_ERROR) + result = -EAI_MEMORY; + else if (rc == IDNA_DLOPEN_ERROR) +@@ -1223,17 +1162,11 @@ gaih_inet (const char *name, const struct gaih_service *service, + canon = strdup (canon); + if (canon == NULL) + { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- + result = -EAI_MEMORY; + goto free_and_return; + } + } + } +- +- if (malloc_tmpbuf2) +- free (tmpbuf2); + } + + family = at2->family; +@@ -1370,10 +1303,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, @@ -4201,8 +4035,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14-2/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14.1/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.1-2/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4211,16 +4045,58 @@ endif ifeq ($(subdir),elf) ---- glibc-2.14/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14-2/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14.1/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.1-2/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.14/sysdeps/unix/nice.c -+++ glibc-2.14-2/sysdeps/unix/nice.c +--- glibc-2.14.1/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf16-utf32-z9.c +@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine \"z9-109\" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf8-utf16-z9.c +@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine \"z9-109\" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf8-utf32-z9.c +@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine \"z9-109\" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/unix/nice.c ++++ glibc-2.14.1-2/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4235,8 +4111,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include <unistd.h> #include <sys/socket.h> @@ -4252,8 +4128,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4296,8 +4172,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -4307,8 +4183,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4342,8 +4218,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -4404,16 +4280,16 @@ + } while (0) + +#include_next <dl-cache.h> ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4446,29 +4322,29 @@ + } while (0) + #include_next <dl-cache.h> ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/i386/dl-procinfo.c> +#else +#include <sysdeps/generic/dl-procinfo.c> +#endif ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#else +#include <sysdeps/generic/dl-procinfo.h> +#endif ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^$RTLDLIST=$$[^ ]*$-ia64$\.so\.[0-9.]*$[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^$RTLDLIST=$$[^ ]*$-ia64$\.so\.[0-9.]*$[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.14/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include <kernel-features.h> @@ -4494,8 +4370,8 @@ struct netlink_res { ---- glibc-2.14/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4505,8 +4381,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4552,8 +4428,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14.1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <jmpbuf-offsets.h> @@ -4580,8 +4456,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14-2/sysdeps/x86_64/__longjmp.S +--- glibc-2.14.1/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.1-2/sysdeps/x86_64/__longjmp.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc. @@ -4611,8 +4487,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14/sysdeps/x86_64/setjmp.S -+++ glibc-2.14-2/sysdeps/x86_64/setjmp.S +--- glibc-2.14.1/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.1-2/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4636,8 +4512,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14/timezone/zic.c -+++ glibc-2.14-2/timezone/zic.c +--- glibc-2.14.1/timezone/zic.c ++++ glibc-2.14.1-2/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9507da1155fc38b123e29da356e41f630f6ebf29
by git＠ipfire.org 16 Dec '11

16 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 9507da1155fc38b123e29da356e41f630f6ebf29 (commit) via 13c9d8485391c063d003bed97d432b049cef2de1 (commit) via 56c0b63cd6dbe7c45b0c8e0104176974badda7f2 (commit) via 6b93268a57d5ad9edacd7d38372848387322644c (commit) via c8f122e554decf714bbcca41e2bf0771bc83ad2e (commit) via 4f670703583e19084ce439d68d5bc1ac3059d3be (commit) via f1e64edd30ad14c036a14fa2820a0eeeb82ac39b (commit) via 35de29fef77b9cca80fee857d6627a7a2b56565f (commit) via b1bb8428d3dc4a2e8b46ce930aaa22770344d54d (commit) from c211953bc7e1a3a0ef0f2923b29d86142f2ef018 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9507da1155fc38b123e29da356e41f630f6ebf29 Merge: 13c9d84 c211953 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 16 16:38:52 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x Conflicts: pth/pth.nm commit 13c9d8485391c063d003bed97d432b049cef2de1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 16 16:37:38 2011 +0100 kernel: Make package ready for ARMv7. commit 56c0b63cd6dbe7c45b0c8e0104176974badda7f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 16 16:34:19 2011 +0100 gcc: Make package read for ARM architecture. + Update binary format to DWARF-4. commit 6b93268a57d5ad9edacd7d38372848387322644c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 16 14:55:05 2011 +0100 beecrypt: Fix build (with openmp and threads). commit c8f122e554decf714bbcca41e2bf0771bc83ad2e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 21:35:37 2011 +0100 kernel: Fix build on ARM. Header files were exported for x86 and it was tried to install vdso files. commit 4f670703583e19084ce439d68d5bc1ac3059d3be Merge: f1e64ed aa1df42 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 02:18:07 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit f1e64edd30ad14c036a14fa2820a0eeeb82ac39b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 10 15:57:03 2011 +0100 db4: Fix package naming and including -devel package. commit 35de29fef77b9cca80fee857d6627a7a2b56565f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 10 15:56:26 2011 +0100 mpfr: Make proper compat package (2.4.2). commit b1bb8428d3dc4a2e8b46ce930aaa22770344d54d Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sat Dec 10 14:27:56 2011 +0100 pth: Fix build on ARM. Fixes #300. ----------------------------------------------------------------------- Summary of changes: beecrypt/beecrypt.nm | 10 +- beecrypt/patches/beecrypt-4.2.1-build-system.patch | 91 +++++++ db4/db4.nm | 8 +- gcc/gcc.nm | 252 ++++++++++++++++---- kernel/kernel.nm | 37 +++- mpfr/mpfr.nm | 30 ++- pth/patches/pth-2.0.5-parallelfix.patch0 | 15 ++ pth/pth.nm | 14 +- 8 files changed, 393 insertions(+), 64 deletions(-) create mode 100644 beecrypt/patches/beecrypt-4.2.1-build-system.patch create mode 100644 pth/patches/pth-2.0.5-parallelfix.patch0 Difference in files: diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm index 8cfe957..8f3aa15 100644 --- a/beecrypt/beecrypt.nm +++ b/beecrypt/beecrypt.nm @@ -5,7 +5,7 @@ name = beecrypt version = 4.2.1 -release = 1 +release = 2 groups = System/Libraries url = http://beecrypt.sourceforge.net/ @@ -27,8 +27,6 @@ build automake gcc-c++ libtool - - perl-Carp end prepare_cmds @@ -36,11 +34,17 @@ build autoreconf end + # Getting weird linking errors without --disable-threads. configure_options += \ + --disable-expert-mode \ + --disable-threads \ + --enable-openmp \ --with-cplusplus=no \ --with-java=no \ --with-python=no + make_build_targets += OPENMP_LIBS="-lgomp" + test make check end diff --git a/beecrypt/patches/beecrypt-4.2.1-build-system.patch b/beecrypt/patches/beecrypt-4.2.1-build-system.patch new file mode 100644 index 0000000..b2bd64a --- /dev/null +++ b/beecrypt/patches/beecrypt-4.2.1-build-system.patch @@ -0,0 +1,91 @@ +--- beecrypt-4.2.1/configure.ac ++++ beecrypt-4.2.1/configure.ac +@@ -11,7 +11,7 @@ + + # Checks for package options + AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ +- ac_enable_expert_mode=yes ++ ac_enable_expert_mode=$enableval + ],[ + if test "X$CFLAGS" != "X"; then + echo "enabling expert mode" +@@ -25,7 +25,7 @@ + if test "$ac_enable_expert_mode" = yes; then + AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) + fi +- ac_enable_debug=yes ++ ac_enable_debug=$enableval + ],[ + ac_enable_debug=no + ]) +@@ -456,7 +456,7 @@ + ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" + ]) + AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ +- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` ++ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` + ]) + fi + fi +--- beecrypt-4.2.1/java/Makefile.am ++++ beecrypt-4.2.1/java/Makefile.am +@@ -26,7 +26,7 @@ + + INCLUDES = -I$(top_srcdir)/include + +-libaltdir=$(prefix)/lib@LIBALT@ ++libaltdir=$(libdir) + + libalt_LTLIBRARIES = libbeecrypt_java.la + +--- beecrypt-4.2.1/acinclude.m4 ++++ beecrypt-4.2.1/acinclude.m4 +@@ -1589,20 +1589,5 @@ + AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) + ]) +- +-AH_BOTTOM([ +-#if ENABLE_THREADS +-# ifndef _REENTRANT +-# define _REENTRANT +-# endif +-# if LINUX +-# define _LIBC_REENTRANT +-# endif +-#else +-# ifdef _REENTRANT +-# undef _REENTRANT +-# endif +-#endif +-]) + + + dnl BEE_THREAD_LOCAL_STORAGE +@@ -1623,7 +1609,5 @@ + ]) + + AH_BOTTOM([ +-#if !ENABLE_THREAD_LOCAL_STORAGE +-# define __thread +-#endif ++#include "config.threads.h" + ]) +--- beecrypt-4.2.1/config.threads.h ++++ beecrypt-4.2.1/config.threads.h +@@ -0,0 +1,16 @@ ++#if ENABLE_THREADS ++# ifndef _REENTRANT ++# define _REENTRANT ++# endif ++# if LINUX ++# define _LIBC_REENTRANT ++# endif ++#else ++# ifdef _REENTRANT ++# undef _REENTRANT ++# endif ++#endif ++ ++#if !ENABLE_THREAD_LOCAL_STORAGE ++# define __thread ++#endif diff --git a/db4/db4.nm b/db4/db4.nm index 4fe07f9..3fd97eb 100644 --- a/db4/db4.nm +++ b/db4/db4.nm @@ -3,12 +3,13 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = db +name = db4 version_major = 4.8 version_minor = 30 version = %{version_major}.%{version_minor} -release = 1 +release = 2 epoch = 1 +thisapp = db-%{version} # Never update this to major version 5. @@ -55,6 +56,9 @@ packages package db4-devel template DEVEL + # Overwrite because of epoch != 0. + requires = %{name}=%{epoch}:%{thisver} + files += \ !/usr/lib*/libdb-%{version_major}.so end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 8fd265a..575cd89 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1 name = gcc version = 4.6.2 -release = 3 +release = 4 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -27,21 +27,20 @@ required_binutils_version = 2.21.51.0.8-1 source_dl = http://ftp.gnu.org/gnu/gcc/%{thisapp}/ sources = %{thisapp}.tar.gz -patches - gcc46-hack.patch0 - gcc46-c++-builtin-redecl.patch0 - gcc46-pr33763.patch0 - gcc46-libgomp-omp_h-multilib.patch0 - gcc46-libtool-no-rpath.patch0 - gcc46-cloog-dl.patch0 - gcc46-pr38757.patch0 - gcc46-no-add-needed.patch0 - gcc46-unwind-debughook-sdt.patch0 - gcc46-ppl-0.10.patch - gcc46-Woverlength-string.patch0 - gcc46-Woverlength-string-asm.patch0 +patches = \ + gcc46-hack.patch0 \ + gcc46-c++-builtin-redecl.patch0 \ + gcc46-pr33763.patch0 \ + gcc46-libgomp-omp_h-multilib.patch0 \ + gcc46-libtool-no-rpath.patch0 \ + gcc46-cloog-dl.patch0 \ + gcc46-pr38757.patch0 \ + gcc46-no-add-needed.patch0 \ + gcc46-unwind-debughook-sdt.patch0 \ + gcc46-ppl-0.10.patch \ + gcc46-Woverlength-string.patch0 \ + gcc46-Woverlength-string-asm.patch0 \ gcc-4.6.0-piepatches-20110407.patch -end build requires @@ -54,7 +53,7 @@ build glibc-devel gmp-devel libffi-devel - mpc-devel + libmpc-devel mpfr-devel texinfo zlib-devel @@ -65,22 +64,43 @@ build requires += cloog-ppl-devel ppl-devel end + # Build libquadmath (only on x86). + build_libquadmath = 0 + # A couple of configure arguments depending on the architecture and # configuration. configure_options = if "%{DISTRO_ARCH}" == "x86_64" configure_options = --disable-multilib + + build_libquadmath = 1 end if "%{DISTRO_ARCH}" == "i686" configure_options = --with-arch=%{DISTRO_ARCH} --with-tune=generic + + build_libquadmath = 1 end if "%{DISTRO_ARCH}" == "armv5tel" + configure_options += --disable-sjlj-exceptions + configure_options += --with-float=soft end + if "${DISTRO_ARCH}" == "armv7hl" + configure_options += --disable-sjlj-exceptions + + configure_options += \ + --with-cpu=cortex-a8 \ + --with-tune=cortex-a8 \ + --with-arch=armv7-a \ + --with-float=hard \ + --with-fpu=vfpv3-d16 \ + --with-abi=aapcs-linux + end + if "%{build_cloog_ppl}" == "1" configure_options += --with-cloog --with-ppl end @@ -129,6 +149,13 @@ build sed -i gcc/Makefile.in \ -e "s|^ESP_NOPIE_CFLAGS = .*|ESP_NOPIE_CFLAGS =|" + # Default to -gdwarf-4 -fno-debug-types-section rather than -gdwarf-2 + sed -i gcc/common.opt \ + -e '/UInteger Var(dwarf_version)/s/Init(2)/Init(4)/' \ + -e '/flag_debug_types_section/s/Init(1)/Init(0)/' \ + -e '/dwarf_record_gcc_switches/s/Init(0)/Init(1)/' \ + -e 's/$may be either 2, 3 or 4; the default version is $2\./\14./' + ./contrib/gcc_update --touch end @@ -136,12 +163,11 @@ build cd %{DIR_SRC}/gcc-build # Modify CFLAGS - OPT_FLAGS="%{CFLAGS}" CFLAGS="%{CFLAGS}" CFLAGS=$(echo ${CFLAGS} | sed -e 's/$-Wp,$\?-D_FORTIFY_SOURCE=[12]//g') CFLAGS=$(echo ${CFLAGS} | sed -e 's/-m64//g;s/-m32//g;s/-m31//g') - CFLAGS=$(echo ${CFLAGS} | sed -e 's/-march=i.86//g') - #CFLAGS=$(echo ${CFLAGS} | sed -e 's/ -pipe / /g') + CFLAGS=$(echo ${CFLAGS} | sed -e 's/-march=i.86//g') + CFLAGS=$(echo ${CFLAGS} | sed -e 's/ -pipe / /g') CFLAGS=$(echo "${CFLAGS}" | sed -e 's/[[:blank:]]\+/ /g') CXXFLAGS=$(echo ${CFLAGS} | sed -e 's/ -Wall//g') @@ -173,7 +199,7 @@ build %{configure_options} # GCC does not support a parallel build. - make profiledbootstrap BOOT_CFLAGS="${OPT_FLAGS}" #%{PARALLELISMFLAGS} + make profiledbootstrap BOOT_CFLAGS="${CFLAGS}" end #test @@ -185,6 +211,10 @@ build cd %{DIR_SRC}/gcc-build make install DESTDIR=%{BUILDROOT} + # Check if the installation path exists. + FULLPATH="%{BUILDROOT}/usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}" + [ -d "${FULLPATH}" ] || exit 1 + mkdir -pv %{BUILDROOT}/lib ln -sfv ../usr/bin/cpp %{BUILDROOT}/lib/cpp ln -sfv gcc %{BUILDROOT}/usr/bin/cc @@ -195,6 +225,25 @@ build # Remove some GNU debugger stuff. rm -vf %{BUILDROOT}/usr/lib/lib*.py + + # libgomp + mv -vf %{BUILDROOT}/usr/lib/libgomp.spec ${FULLPATH}/ + ln -svf ../../../libgomp.so.1.0.0 ${FULLPATH}/libgomp.so + chmod 755 %{BUILDROOT}/usr/lib/libgomp.so.1.* + + # libstdc++ + ln -svf ../../../libstdc++.so.6.0.16 ${FULLPATH}/libstdc++.so + + # libmudflap + ln -svf ../../../libmudflap.so.0.0.0 ${FULLPATH}/libmudflap.so + ln -svf ../../../libmudflapth.so.0.0.0 ${FULLPATH}/libmudflapth.so + chmod 755 %{BUILDROOT}/usr/lib/libmudflap{,th}.so.0.* + + # libquadmath + if [ "%{build_libquadmath}" = "1" ]; then + ln -svf ../../../libquadmath.so.0.* ${FULLPATH}/libquadmath.so + chmod 755 %{BUILDROOT}/usr/lib/libquadmath.so.0.* + fi end keep_libraries @@ -211,7 +260,9 @@ packages binutils>=%{required_binutils_version} glibc-devel gmp-devel - libgcc-devel + cpp=%{thisver} + libgcc=%{thisver} + libgomp=%{thisver} end if "%{build_cloog_ppl}" == "1" @@ -219,10 +270,19 @@ packages end end - # XXX add package descriptions - package %{name}-c++ - requires = gcc=%{thisver} libstdc++-devel + summary = C++ support for GCC. + description + This package adds C++ support to the GNU Compiler Collection. + It includes support for most of the current C++ specification, + including templates and exception handling. + end + + requires + gcc=%{thisver} + libstdc++=%{thisver} + libstdc++-devel=%{thisver} + end files /usr/bin/*++ @@ -231,27 +291,76 @@ packages end end - package libgcc + package cpp + summary = The C Preprocessor. + description + Cpp is the GNU C-Compatible Compiler Preprocessor. + Cpp is a macro processor which is used automatically + by the C compiler to transform your program before actual + compilation. It is called a macro processor because it allows + you to define macros, abbreviations for longer + constructs. + + The C preprocessor provides four separate functionalities: the + inclusion of header files (files of declarations that can be + substituted into your program); macro expansion (you can define macros, + and the C preprocessor will replace the macros with their definitions + throughout the program); conditional compilation (using special + preprocessing directives, you can include or exclude parts of the + program according to various conditions); and line control (if you use + a program to combine or rearrange source files into an intermediate + file which is then compiled, you can use line control to inform the + compiler about where each source line originated). + + You should install this package if you are a C programmer and you use + macros. + end + group = Development/Languages + files - /lib/libgcc*.so.* + /lib/cpp + /usr/bin/cpp + /usr/share/man/man1/cpp.1* + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/cc1 end end - package libgcc-devel - requires = libgcc=%{thisver} + package libgcc + summary = GCC shared support library. + description + This package contains GCC shared support library which is needed + e.g. for exception handling support. + end files - /usr/lib/libgcc*.so + /lib/libgcc*.so.* end end package libstdc++ + summary = GNU Standard C++ Library. + description + The libstdc++ package contains a rewritten standard compliant GCC Standard + C++ Library. + end + files /usr/lib/libstdc++*.so.* end end package libstdc++-devel + summary = Header files and libraries for C++ development. + description + This is the GNU implementation of the standard C++ libraries. This + package includes the header files and libraries needed for C++ + development. This includes rewritten implementation of STL. + end + + requires + libstdc++=%{thisver} + end + files /usr/include/c++ /usr/lib/libstdc++*.so @@ -259,39 +368,100 @@ packages end package libgomp - files - /usr/lib/libgomp*.so.* + summary = GCC OpenMP v3.0 shared support library. + description + This package contains GCC shared support library which is needed + for OpenMP v3.0 support. end - end - package libgomp files - /usr/lib/libgomp*.so - /usr/lib/libgomp.spec + /usr/lib/libgomp*.so.* end end package libmudflap + summary = GCC mudflap shared support library. + description + This package contains GCC shared support library which is needed + for mudflap support. + end + files /usr/lib/libmudflap*.so.* end end package libmudflap-devel + summary = Development files for GCC mudflap support. + description + This package contains headers for building mudflap-instrumented programs. + + To instrument a non-threaded program, add -fmudflap + option to GCC and when linking add -lmudflap, for threaded programs + also add -fmudflapth and -lmudflapth. + end + + requires + libmudflap=%{thisver} + end + files - /usr/lib/libmudflap*.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/mf-runtime.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflap.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflapth.so end end - package libquadmath - files - /usr/lib/libquadmath*.so.* + if "%{build_libquadmath}" == "1" + package libquadmath + summary = GCC __float128 shared support library. + description + This package contains GCC shared support library which is needed + for __float128 math support and for Fortran REAL*16 support. + end + + files + /usr/lib/libquadmath*.so.* + end + end + + package libquadmath-devel + summary = Development files for GCC __float128 support. + description + This package contains headers for building Fortran programs using + REAL*16 and programs using __float128 math. + end + + requires + gcc=%{thisver} + libquadmath=%{thisver} + end + + files + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath_weak.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libquadmath.so + end end end - package libquadmath-devel + package gcc-plugin-devel + summary = Support for compiling GCC plugins. + description + This package contains header files and other support files + for compiling GCC plugins. The GCC plugin ABI is currently + not stable, so plugins must be rebuilt any time GCC is updated. + end + + requires + gcc=%{thisver} + gmp-devel>=4.1.2-8 + mpfr-devel>=2.2.1 + libmpc-devel>=0.8.1 + end + files - /usr/lib/libquadmath*.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/plugin end end diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 67a98bd..d6ec034 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 3.1.4 -release = 2 +release = 3 thisapp = linux-%{version} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -41,14 +41,17 @@ build module-init-tools ncurses-devel net-tools - newt-devel - pciutils-devel perl python-devel - slang-devel xz-lzma-compat end + tools_cpupower_requires + newt-devel + pcituils-devel + slang-devel + end + # A list of kernels to build. kernels = @@ -78,6 +81,15 @@ build build_cpupower = 0 end + if "%{DISTRO_ARCH}" == "armv7hl" + # Currently build no kernel images. + + kernel_arch = arm + + # ARM does not support cpupower. + build_cpupower = 0 + end + # Build default kernel. if "%{build_kernel_default}" == "1" kernels += default @@ -93,6 +105,11 @@ build kernels += versatile end + # Add tools' build requirements if build is requested. + if "%{build_cpupower}" == "1" + requires += %{tools_cpupower_requires} + end + prepare_cmds rm -f %{DIR_APP}/localversion-grsec @@ -172,8 +189,14 @@ build # Install modules. make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \ KERNELRELEASE=${fullversion} modules_install - make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \ - KERNELRELEASE=${fullversion} vdso_install + + # Install vdso. + case "%{DISTRO_ARCH}" in + i686) + make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \ + KERNELRELEASE=${fullversion} vdso_install + ;; + esac # Create an empty settings file for dracut mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d @@ -244,7 +267,7 @@ build install # Install the header files - make ARCH=x86 INSTALL_HDR_PATH=dest headers_install + make ARCH=%{kernel_arch} INSTALL_HDR_PATH=dest headers_install mkdir -pv %{BUILDROOT}/usr/include find dest/include $ -name .install -o -name ..install.cmd $ -delete cp -rv dest/include/* %{BUILDROOT}/usr/include diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index 848d037..4a19405 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -5,7 +5,9 @@ name = mpfr version = 3.1.0 -release = 1 +release = 2 + +compat_version = 2.4.2 groups = System/Libraries url = http://www.mpfr.org/ @@ -22,6 +24,7 @@ description end source_dl = http://mpfr.loria.fr/mpfr-%{version}/ +sources += %{name}-%{compat_version}.tar.bz2 build requires @@ -29,15 +32,32 @@ build end configure_options += \ - --enable-thread-safe + --enable-thread-safe \ + --disable-assert + + build_cmds + + cd %{DIR_SRC}/%{name}-%{compat_version} + ./configure \ + %{configure_options} + + export LD_LIBRARY_PATH=$(pwd)/.libs + make %{PARALLELISMFLAGS} + end test + export LD_LIBRARY_PATH=$(pwd)/.libs + make check + + cd %{DIR_SRC}/%{name}-%{compat_version} + export LD_LIBRARY_PATH=$(pwd)/.libs make check end install_cmds - ln -svf libmpfr.so.4 %{BUILDROOT}/usr/lib/libmpfr.so.1 - ln -svf libmpfr.so.4.1.0 %{BUILDROOT}/usr/lib/libmpfr.so.1.2.2 + cd %{DIR_SRC}/%{name}-%{compat_version} + install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}/usr/lib/ + ln -svf libmpfr.so.1.2.2 %{BUILDROOT}/usr/lib/libmpfr.so.1 end end @@ -51,8 +71,6 @@ packages package %{name}-compat summary = Compat libraries of %{thisapp}. - provides = libmpfr.so.1 - files /usr/lib/libmpfr.so.1* end diff --git a/pth/patches/pth-2.0.5-parallelfix.patch0 b/pth/patches/pth-2.0.5-parallelfix.patch0 new file mode 100644 index 0000000..a305f59 --- /dev/null +++ b/pth/patches/pth-2.0.5-parallelfix.patch0 @@ -0,0 +1,15 @@ +--- Makefile.in.orig 2005-11-08 05:58:55.000000000 +1100 ++++ Makefile.in 2005-11-08 06:29:02.000000000 +1100 +@@ -148,10 +148,9 @@ + + # be aware of libtool when building the objects + .SUFFIXES: +-.SUFFIXES: .c .o .lo +-.c.o: ++%.o: %.c $(TARGET_PREQ) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< +-.c.lo: ++%.lo: %.c $(TARGET_PREQ) + $(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + + # the default target diff --git a/pth/pth.nm b/pth/pth.nm index 345c159..67c5687 100644 --- a/pth/pth.nm +++ b/pth/pth.nm @@ -5,7 +5,7 @@ name = pth version = 2.0.7 -release = 1 +release = 2 groups = System/Libraries url = http://www.gnu.org/software/pth @@ -19,19 +19,24 @@ description applications. end -source_dl = +source_dl = ftp://ftp.gnu.org/gnu/pth/ build requires libtool end - PARALLELISMFLAGS = # No parallel build - configure_options += \ --disable-static \ --mandir=/usr/share/man + if "%{DISTRO_ARCH}" == "armv5tel" + configure_options += \ + --with-mctx-mth=sjlj \ + --with-mctx-dsp=ssjlj \ + --with-mctx-stk=sas + end + test make check end @@ -39,7 +44,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c211953bc7e1a3a0ef0f2923b29d86142f2ef018
by git＠ipfire.org 15 Dec '11

15 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via c211953bc7e1a3a0ef0f2923b29d86142f2ef018 (commit) via 33ad1e738b747a1002ee316d84e054f026da2fec (commit) from 18860e84283cb71f5ba79842495de0cd93acde23 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c211953bc7e1a3a0ef0f2923b29d86142f2ef018 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 15 11:03:42 2011 +0100 pcre: Update to 8.21. Fixes #306. commit 33ad1e738b747a1002ee316d84e054f026da2fec Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 15 11:03:06 2011 +0100 gnutls: Update to 3.0.9. Fixes #305. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 2 +- pcre/pcre.nm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 4414df6..5f78089 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -4,7 +4,7 @@ ############################################################################### name = gnutls -version = 3.0.8 +version = 3.0.9 release = 1 groups = System/Libraries diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 5dd980f..c9eba48 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,7 +4,7 @@ ############################################################################### name = pcre -version = 8.20 +version = 8.21 release = 1 groups = System/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 18860e84283cb71f5ba79842495de0cd93acde23
by git＠ipfire.org 15 Dec '11

15 Dec '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 42945a976f7ef2cbb0718015fb5dc360a024d61b
by git＠ipfire.org 11 Dec '11

11 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 42945a976f7ef2cbb0718015fb5dc360a024d61b (commit) via 96af805cc95d603fcb0f3c84a1b7f89420fdee82 (commit) via 1f9bc2f0e48a166bd7fb683833579ce1773d2a06 (commit) via 11ca4f204e9fbdeff8027d3a1d3ede7a36242e65 (commit) from aa1df42da2262e93c29a28c53d0e2ed1c03d634b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42945a976f7ef2cbb0718015fb5dc360a024d61b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 11:14:55 2011 +0100 u-boot: Add -debuginfo package after merge. commit 96af805cc95d603fcb0f3c84a1b7f89420fdee82 Merge: 1f9bc2f 11ca4f2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 11:14:05 2011 +0100 Merge remote-tracking branch 'ms/u-boot' commit 1f9bc2f0e48a166bd7fb683833579ce1773d2a06 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 11 11:12:58 2011 +0100 Add a -debuginfo for every package that is not noarch. And fix some whitespace errors as well. commit 11ca4f204e9fbdeff8027d3a1d3ede7a36242e65 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 10 21:11:50 2011 +0100 u-boot: New package. Needed to boot ARM boxes and boards like Dreamplug and Pandaboard. ----------------------------------------------------------------------- Summary of changes: ImageMagick/ImageMagick.nm | 6 +- MAKEDEV/MAKEDEV.nm | 6 +- X11vnc/X11vnc.nm | 4 + acl/acl.nm | 10 +- acpid/acpid.nm | 4 + aiccu/aiccu.nm | 4 + attr/attr.nm | 8 +- audit/audit.nm | 6 +- authconfig/authconfig.nm | 6 +- autogen/autogen.nm | 4 + avahi/avahi.nm | 8 +- bash/bash.nm | 4 + bc/bc.nm | 4 + beecrypt/beecrypt.nm | 4 + beep/beep.nm | 4 + bind/bind.nm | 6 +- binutils/binutils.nm | 4 + bird/bird.nm | 4 + bison/bison.nm | 4 + boost/boost.nm | 6 +- br2684ctl/br2684ctl.nm | 4 + bridge-utils/bridge-utils.nm | 4 + btrfs-progs/btrfs-progs.nm | 4 + bwm-ng/bwm-ng.nm | 4 + bzip2/bzip2.nm | 4 + c_icap/c_icap.nm | 4 + c_icap_modules/c_icap_modules.nm | 4 + cairo/cairo.nm | 6 +- ccache/ccache.nm | 4 + chrony/chrony.nm | 12 +- chrpath/chrpath.nm | 4 + clamav/clamav.nm | 8 +- cloog-ppl/cloog-ppl.nm | 4 + cmake/cmake.nm | 4 + coreutils/coreutils.nm | 4 + cpio/cpio.nm | 4 + cpufrequtils/cpufrequtils.nm | 6 +- cracklib/cracklib.nm | 14 +- crda/crda.nm | 4 + cronie/cronie.nm | 4 + cryptsetup-luks/cryptsetup-luks.nm | 6 +- cups/cups.nm | 8 +- curl/curl.nm | 10 +- cyrus-sasl/cyrus-sasl.nm | 6 +- dansguardian/dansguardian.nm | 4 + db4/db4.nm | 10 +- dbus-glib/dbus-glib.nm | 8 +- dbus/dbus.nm | 14 +- dejagnu/dejagnu.nm | 2 +- dhcp/dhcp.nm | 8 +- dhcping/dhcping.nm | 4 + dialog/dialog.nm | 4 + diffutils/diffutils.nm | 4 + directfb/directfb.nm | 4 + dmidecode/dmidecode.nm | 4 + dmraid/dmraid.nm | 6 +- docbook-dtds/docbook-dtds.nm | 4 +- docbook-utils/docbook-utils.nm | 4 + dos2unix/dos2unix.nm | 4 + dosfstools/dosfstools.nm | 4 + dracut/dracut.nm | 12 +- dvdrtools/dvdrtools.nm | 4 + e2fsprogs/e2fsprogs.nm | 6 +- ebtables/ebtables.nm | 4 + ed/ed.nm | 4 + eggdbus/eggdbus.nm | 6 +- eject/eject.nm | 4 + elfutils/elfutils.nm | 6 +- elinks/elinks.nm | 4 + etherwake/etherwake.nm | 4 + ethtool/ethtool.nm | 4 + expat/expat.nm | 6 +- expect/expect.nm | 4 + ez-ipupdate/ez-ipupdate.nm | 4 + fail2ban/fail2ban.nm | 4 + file/file.nm | 4 + filesystem/filesystem.nm | 7 +- findutils/findutils.nm | 4 + firewall/firewall.nm | 4 + flex/flex.nm | 6 +- fontconfig/fontconfig.nm | 6 +- freeradius/freeradius.nm | 10 +- freetype/freetype.nm | 6 +- fuse-sshfs/fuse-sshfs.nm | 4 + fuse/fuse.nm | 6 +- gawk/gawk.nm | 4 + gcc/gcc.nm | 4 + gdb/gdb.nm | 4 + gdbm/gdbm.nm | 6 +- gdk-pixbuf2/gdk-pixbuf2.nm | 6 +- gettext/gettext.nm | 6 +- ghostscript/ghostscript.nm | 4 + git/git.nm | 7 +- glib2/glib2.nm | 4 + glibc/glibc.nm | 6 +- gmp/gmp.nm | 4 + gnupg2/gnupg2.nm | 4 + gnutls/gnutls.nm | 4 + gobject-introspection/gobject-introspection.nm | 8 +- gperf/gperf.nm | 4 + grep/grep.nm | 4 + groff/groff.nm | 4 + grub/grub.nm | 4 + grubby/grubby.nm | 10 +- gssdp/gssdp.nm | 6 +- guile/guile.nm | 4 + gupnp-av/gupnp-av.nm | 6 +- gupnp-igd/gupnp-igd.nm | 6 +- gupnp/gupnp.nm | 6 +- gzip/gzip.nm | 4 + hdparm/hdparm.nm | 4 + help2man/help2man.nm | 4 + hostapd/hostapd.nm | 4 + hplip/hplip.nm | 4 + htop/htop.nm | 4 + ibod/ibod.nm | 6 +- icecream/icecream.nm | 6 +- iftop/iftop.nm | 4 + igmpproxy/igmpproxy.nm | 4 + initscripts/initscripts.nm | 4 + iperf/iperf.nm | 4 + iproute2/iproute2.nm | 4 + iptables/iptables.nm | 6 +- iputils/iputils.nm | 4 + iscsi-initiator-utils/iscsi-initiator-utils.nm | 12 +- isdn4k-utils/isdn4k-utils.nm | 14 +- iw/iw.nm | 4 + joe/joe.nm | 4 + jwhois/jwhois.nm | 4 + kbd/kbd.nm | 4 + keepalived/keepalived.nm | 4 + ldapvi/ldapvi.nm | 4 + less/less.nm | 4 + libICE/libICE.nm | 6 +- libSM/libSM.nm | 6 +- libVNCServer/libVNCServer.nm | 6 +- libX11/libX11.nm | 6 +- libXau/libXau.nm | 6 +- libXaw/libXaw.nm | 6 +- libXdamage/libXdamage.nm | 6 +- libXdmcp/libXdmcp.nm | 6 +- libXext/libXext.nm | 6 +- libXfixes/libXfixes.nm | 6 +- libXfont/libXfont.nm | 6 +- libXft/libXft.nm | 6 +- libXi/libXi.nm | 6 +- libXmu/libXmu.nm | 6 +- libXpm/libXpm.nm | 6 +- libXrandr/libXrandr.nm | 6 +- libXrender/libXrender.nm | 6 +- libXres/libXres.nm | 6 +- libXt/libXt.nm | 6 +- libXtst/libXtst.nm | 6 +- libXv/libXv.nm | 6 +- libXvMC/libXvMC.nm | 6 +- libXxf86vm/libXxf86vm.nm | 6 +- libaal/libaal.nm | 6 +- libaio/libaio.nm | 6 +- libarchive/libarchive.nm | 6 +- libart/libart.nm | 6 +- libassuan/libassuan.nm | 6 +- libatasmart/libatasmart.nm | 6 +- libcap-ng/libcap-ng.nm | 6 +- libcap/libcap.nm | 4 + libcgroup/libcgroup.nm | 6 +- libcroco/libcroco.nm | 8 +- libdaemon/libdaemon.nm | 6 +- libdnet/libdnet.nm | 6 +- libdrm/libdrm.nm | 6 +- libedit/libedit.nm | 8 +- libevent/libevent.nm | 6 +- libffi/libffi.nm | 8 +- libfontenc/libfontenc.nm | 6 +- libgcrypt/libgcrypt.nm | 8 +- libgpg-error/libgpg-error.nm | 6 +- libgssglue/libgssglue.nm | 6 +- libidn/libidn.nm | 6 +- libjpeg/libjpeg.nm | 6 +- libksba/libksba.nm | 6 +- libmng/libmng.nm | 6 +- libmpc/libmpc.nm | 4 + libnet/libnet.nm | 6 +- libnetfilter_conntrack/libnetfilter_conntrack.nm | 6 +- libnetfilter_log/libnetfilter_log.nm | 6 +- libnetfilter_queue/libnetfilter_queue.nm | 6 +- libnfnetlink/libnfnetlink.nm | 6 +- libnfsidmap/libnfsidmap.nm | 6 +- libnl/libnl.nm | 6 +- libpcap/libpcap.nm | 6 +- libpciaccess/libpciaccess.nm | 6 +- libpipeline/libpipeline.nm | 6 +- libpng/libpng.nm | 6 +- librpcsecgss/librpcsecgss.nm | 6 +- librsvg2/librsvg2.nm | 8 +- libselinux/libselinux.nm | 14 +- libsemanage/libsemanage.nm | 10 +- libsepol/libsepol.nm | 6 +- libsigc++/libsigc++.nm | 6 +- libsolv/libsolv.nm | 6 +- libsoup/libsoup.nm | 8 +- libssh2/libssh2.nm | 6 +- libtasn1/libtasn1.nm | 6 +- libtiff/libtiff.nm | 6 +- libtool/libtool.nm | 4 + libtorrent/libtorrent.nm | 6 +- libusb-compat/libusb-compat.nm | 6 +- libusb/libusb.nm | 6 +- libuser/libuser.nm | 6 +- libvirt/libvirt.nm | 6 +- libxcb/libxcb.nm | 8 +- libxkbfile/libxkbfile.nm | 6 +- libxml2/libxml2.nm | 6 +- libxslt/libxslt.nm | 6 +- libyaml/libyaml.nm | 6 +- lighttpd/lighttpd.nm | 12 +- linux-atm/linux-atm.nm | 6 +- linux-firmware/linux-firmware.nm | 4 + lldpd/lldpd.nm | 4 + lm-sensors/lm-sensors.nm | 4 + logrotate/logrotate.nm | 4 + lsof/lsof.nm | 4 + lua/lua.nm | 10 +- lvm2/lvm2.nm | 8 +- lzo/lzo.nm | 4 + m4/m4.nm | 4 + make/make.nm | 4 + man-db/man-db.nm | 4 + mc/mc.nm | 6 +- mdadm/mdadm.nm | 6 +- memtest86+/memtest86+.nm | 4 + mesa/mesa.nm | 4 + minicom/minicom.nm | 4 + module-init-tools/module-init-tools.nm | 4 + mpfr/mpfr.nm | 6 +- mstpd/mstpd.nm | 4 + multipath-tools/multipath-tools.nm | 6 +- nano/nano.nm | 4 + nasm/nasm.nm | 4 + ncurses/ncurses.nm | 10 +- net-snmp/net-snmp.nm | 4 + net-tools/net-tools.nm | 4 + netplug/netplug.nm | 4 + nettle/nettle.nm | 4 + newt/newt.nm | 4 + nfs-utils/nfs-utils.nm | 4 + nmap/nmap.nm | 4 + noip/noip.nm | 4 + nspr/nspr.nm | 4 + nss-myhostname/nss-myhostname.nm | 4 + nss-softokn/nss-softokn.nm | 4 + nss-util/nss-util.nm | 4 + nss/nss.nm | 6 +- nss_ldap/nss_ldap.nm | 4 + open-vm-tools/open-vm-tools.nm | 4 + openjade/openjade.nm | 6 +- openl2tp/openl2tp.nm | 4 + openldap/openldap.nm | 4 + opensp/opensp.nm | 4 + openssh/openssh.nm | 14 +- openssl/openssl.nm | 4 + openvpn/openvpn.nm | 4 + os-prober/os-prober.nm | 4 + p11-kit/p11-kit.nm | 4 + pakfire/pakfire.nm | 4 + pam/pam.nm | 4 + pam_ldap/pam_ldap.nm | 4 + pango/pango.nm | 8 +- parted/parted.nm | 6 +- passwd/passwd.nm | 4 + patch/patch.nm | 4 + pax-utils/pax-utils.nm | 4 + paxctl/paxctl.nm | 4 + paxtest/paxtest.nm | 4 + pcapy/pcapy.nm | 4 + pciutils/pciutils.nm | 8 +- pcre/pcre.nm | 4 + pdns-recursor/pdns-recursor.nm | 4 + pdns/pdns.nm | 4 + perl-HTML-Parser/perl-HTML-Parser.nm | 4 + perl-XML-Parser/perl-XML-Parser.nm | 4 + perl/perl.nm | 180 ++++++++++---------- pinentry/pinentry.nm | 4 + pixman/pixman.nm | 6 +- pkg-config/pkg-config.nm | 4 + polkit/polkit.nm | 6 +- popt/popt.nm | 6 +- powertop/powertop.nm | 4 + ppl/ppl.nm | 4 + ppp/ppp.nm | 6 +- pptp/pptp.nm | 4 + procps/procps.nm | 4 + psmisc/psmisc.nm | 4 + pth/pth.nm | 6 +- pyQt/pyQt.nm | 8 +- pyfire/pyfire.nm | 4 + pygobject2/pygobject2.nm | 10 +- pyliblzma/pyliblzma.nm | 4 + python-cairo/python-cairo.nm | 6 +- python-cryptsetup/python-cryptsetup.nm | 4 + python-dbus/python-dbus.nm | 6 +- python-gudev/python-gudev.nm | 4 + python-m2crypto/python-m2crypto.nm | 4 + .../python-netfilter_conntrack.nm | 4 + python-parted/python-parted.nm | 4 + python-piksemel/python-piksemel.nm | 4 + python-pyaspects/python-pyaspects.nm | 4 + python-pyblock/python-pyblock.nm | 4 + python-pycurl/python-pycurl.nm | 4 + python-qtermwidget/python-qtermwidget.nm | 4 + python/python.nm | 6 +- pyxattr/pyxattr.nm | 4 + qemu/qemu.nm | 4 + qt/qt.nm | 8 +- qtermwidget/qtermwidget.nm | 6 +- quagga/quagga.nm | 4 + radvd/radvd.nm | 4 + readline/readline.nm | 4 + reiser4progs/reiser4progs.nm | 6 +- reiserfsprogs/reiserfsprogs.nm | 4 + rrdtool/rrdtool.nm | 8 +- rsync/rsync.nm | 4 + rsyslog/rsyslog.nm | 4 + rtorrent/rtorrent.nm | 4 + samba/samba.nm | 4 + sane/sane.nm | 8 +- screen/screen.nm | 4 + sdl/sdl.nm | 6 +- sed/sed.nm | 4 + setup/setup.nm | 4 + sg3-utils/sg3-utils.nm | 8 +- sgml-common/sgml-common.nm | 2 +- shadow-utils/shadow-utils.nm | 4 + sip/sip.nm | 10 +- slang/slang.nm | 6 +- smartmontools/smartmontools.nm | 4 + sqlite/sqlite.nm | 4 + squashfs-tools/squashfs-tools.nm | 4 + squid/squid.nm | 6 +- squidGuard/squidGuard.nm | 4 + strace/strace.nm | 4 + strongswan/strongswan.nm | 4 + sudo/sudo.nm | 4 + suricata/suricata.nm | 6 +- swig/swig.nm | 4 + sysfsutils/sysfsutils.nm | 6 +- syslinux/syslinux.nm | 6 +- systemd/systemd.nm | 10 +- sysvinit/sysvinit.nm | 4 + tar/tar.nm | 4 + tcl/tcl.nm | 4 + tcpdump/tcpdump.nm | 4 + telnet/telnet.nm | 4 + texinfo/texinfo.nm | 4 + tinc/tinc.nm | 4 + traceroute/traceroute.nm | 4 + transmission/transmission.nm | 4 + tunctl/tunctl.nm | 4 + u-boot/targets | 12 ++ u-boot/u-boot.nm | 87 ++++++++++ udev/udev.nm | 4 + udisks/udisks.nm | 4 + ulogd2/ulogd2.nm | 4 + unzip/unzip.nm | 4 + upower/upower.nm | 8 +- usb-modeswitch/usb-modeswitch.nm | 4 + usbutils/usbutils.nm | 4 + ustr/ustr.nm | 8 +- util-linux/util-linux.nm | 16 +- vala/vala.nm | 6 +- vim/vim.nm | 4 + vlan/vlan.nm | 4 + vsftpd/vsftpd.nm | 4 + wavemon/wavemon.nm | 4 + wget/wget.nm | 4 + which/which.nm | 4 + wireless-tools/wireless-tools.nm | 6 +- wpa_supplicant/wpa_supplicant.nm | 4 + xcb-util/xcb-util.nm | 6 +- xen/xen.nm | 4 + xfsprogs/xfsprogs.nm | 6 +- xmlto/xmlto.nm | 4 + xorg-x11-drv-ati/xorg-x11-drv-ati.nm | 4 + xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 4 + xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 4 + xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 4 + xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 4 + xorg-x11-drv-nv/xorg-x11-drv-nv.nm | 4 + xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm | 6 +- xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 4 + xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm | 4 + xorg-x11-font-utils/xorg-x11-font-utils.nm | 6 +- xorg-x11-fonts/xorg-x11-fonts.nm | 6 +- xorg-x11-server/xorg-x11-server.nm | 8 +- xorg-x11-xinit/xorg-x11-xinit.nm | 4 + xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 4 + xrandr/xrandr.nm | 4 + xterm/xterm.nm | 4 + xz/xz.nm | 4 + zerofree/zerofree.nm | 4 + zlib/zlib.nm | 6 +- 400 files changed, 2034 insertions(+), 357 deletions(-) create mode 100644 u-boot/targets create mode 100644 u-boot/u-boot.nm Difference in files: diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm index dc5ecff..c5d75ad 100644 --- a/ImageMagick/ImageMagick.nm +++ b/ImageMagick/ImageMagick.nm @@ -42,8 +42,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/MAKEDEV/MAKEDEV.nm b/MAKEDEV/MAKEDEV.nm index 7d82cab..4cf5627 100644 --- a/MAKEDEV/MAKEDEV.nm +++ b/MAKEDEV/MAKEDEV.nm @@ -8,7 +8,7 @@ version = 3.24 release = 1 groups = System/Base -url = +url = license = GPLv2 summary = A program used for creating device files in /dev. @@ -60,4 +60,8 @@ packages -c "virtual console memory owner" vcsa 2>/dev/null end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/X11vnc/X11vnc.nm b/X11vnc/X11vnc.nm index f4b2b77..e38dd26 100644 --- a/X11vnc/X11vnc.nm +++ b/X11vnc/X11vnc.nm @@ -53,4 +53,8 @@ packages xorg-x11-server end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/acl/acl.nm b/acl/acl.nm index f75a039..069b963 100644 --- a/acl/acl.nm +++ b/acl/acl.nm @@ -47,12 +47,18 @@ end packages package %{name} end - + package libacl template LIBS end - + package libacl-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + + provides += libacl-debuginfo + end end diff --git a/acpid/acpid.nm b/acpid/acpid.nm index 01f28f7..4e41f98 100644 --- a/acpid/acpid.nm +++ b/acpid/acpid.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/aiccu/aiccu.nm b/aiccu/aiccu.nm index 7334bfd..a879172 100644 --- a/aiccu/aiccu.nm +++ b/aiccu/aiccu.nm @@ -40,4 +40,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/attr/attr.nm b/attr/attr.nm index cc27de0..9a6a8de 100644 --- a/attr/attr.nm +++ b/attr/attr.nm @@ -46,8 +46,14 @@ end packages package lib%{name} end - + package lib%{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + + provides += libattr-debuginfo + end end diff --git a/audit/audit.nm b/audit/audit.nm index 04d258f..5e36fbb 100644 --- a/audit/audit.nm +++ b/audit/audit.nm @@ -63,8 +63,12 @@ packages package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm index f89d1ab..12b7230 100644 --- a/authconfig/authconfig.nm +++ b/authconfig/authconfig.nm @@ -68,8 +68,12 @@ packages package %{name} requires += newt-python end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/autogen/autogen.nm b/autogen/autogen.nm index 6e6ee13..3dec57f 100644 --- a/autogen/autogen.nm +++ b/autogen/autogen.nm @@ -31,4 +31,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/avahi/avahi.nm b/avahi/avahi.nm index 2ca00ec..a0d4e98 100644 --- a/avahi/avahi.nm +++ b/avahi/avahi.nm @@ -59,12 +59,16 @@ packages package %{name} requires = libdaemon>=0.14 end - + package %{name}-devel template DEVEL end - + package %{name}-libs template LIBS end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bash/bash.nm b/bash/bash.nm index d9d33b3..0aa49f0 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -110,4 +110,8 @@ packages mv -f /etc/shells{.$$,} end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bc/bc.nm b/bc/bc.nm index 71d89a4..9b91ebd 100644 --- a/bc/bc.nm +++ b/bc/bc.nm @@ -40,4 +40,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm index 0235e07..8cfe957 100644 --- a/beecrypt/beecrypt.nm +++ b/beecrypt/beecrypt.nm @@ -52,4 +52,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/beep/beep.nm b/beep/beep.nm index 6de82ee..6cdf5d9 100644 --- a/beep/beep.nm +++ b/beep/beep.nm @@ -40,4 +40,8 @@ end packages package beep + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bind/bind.nm b/bind/bind.nm index 2799b0e..8563b7c 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -142,7 +142,7 @@ build tar -C %{BUILDROOT} -xaf %{DIR_DL}/bind-config-8.tar.bz2 touch %{BUILDROOT}/etc/rndc.key touch %{BUILDROOT}/etc/rndc.conf - + mkdir %{BUILDROOT}/etc/named install -m 644 bind.keys %{BUILDROOT}/etc/named.iscdlv.key install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key @@ -215,4 +215,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/binutils/binutils.nm b/binutils/binutils.nm index 0fd97de..8879700 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -94,4 +94,8 @@ packages /usr/lib/*.a end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bird/bird.nm b/bird/bird.nm index b6bcb7f..72046aa 100644 --- a/bird/bird.nm +++ b/bird/bird.nm @@ -81,4 +81,8 @@ packages /bin/systemctl reload-or-try-restart bird6.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bison/bison.nm b/bison/bison.nm index ab7ad3c..7335957 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -47,4 +47,8 @@ packages package %{name} requires += m4 end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/boost/boost.nm b/boost/boost.nm index 0493c08..452ef25 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -69,8 +69,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/br2684ctl/br2684ctl.nm b/br2684ctl/br2684ctl.nm index 556f94c..6cf052c 100644 --- a/br2684ctl/br2684ctl.nm +++ b/br2684ctl/br2684ctl.nm @@ -44,4 +44,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bridge-utils/bridge-utils.nm b/bridge-utils/bridge-utils.nm index 4f55a63..65f0175 100644 --- a/bridge-utils/bridge-utils.nm +++ b/bridge-utils/bridge-utils.nm @@ -43,4 +43,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/btrfs-progs/btrfs-progs.nm b/btrfs-progs/btrfs-progs.nm index c76feb7..ae99614 100644 --- a/btrfs-progs/btrfs-progs.nm +++ b/btrfs-progs/btrfs-progs.nm @@ -45,4 +45,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bwm-ng/bwm-ng.nm b/bwm-ng/bwm-ng.nm index 738321d..d319cc1 100644 --- a/bwm-ng/bwm-ng.nm +++ b/bwm-ng/bwm-ng.nm @@ -27,4 +27,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm index 97e1972..39dcf18 100644 --- a/bzip2/bzip2.nm +++ b/bzip2/bzip2.nm @@ -62,4 +62,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm index 3fde768..bf873ec 100644 --- a/c_icap/c_icap.nm +++ b/c_icap/c_icap.nm @@ -50,4 +50,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm index 7b8cde1..5f34d46 100644 --- a/c_icap_modules/c_icap_modules.nm +++ b/c_icap_modules/c_icap_modules.nm @@ -48,4 +48,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cairo/cairo.nm b/cairo/cairo.nm index ed393a3..5cafa62 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -36,7 +36,7 @@ packages package %{name}-devel template DEVEL - + # The development package needs the other dependencies as well. requires fontconfig-devel @@ -45,4 +45,8 @@ packages pixman-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ccache/ccache.nm b/ccache/ccache.nm index c9569a2..8c25d7c 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -64,4 +64,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/chrony/chrony.nm b/chrony/chrony.nm index c80e028..956eead 100644 --- a/chrony/chrony.nm +++ b/chrony/chrony.nm @@ -79,28 +79,32 @@ packages /etc/chrony.conf /etc/chrony.keys end - + prerequires = shadow-utils systemd-units script prein %{create_user} end - + script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl --no-reload enable \ chrony-wait.service chronyd.service >/dev/null 2>&1 || : end - + script preun /bin/systemctl --no-reload disable \ chrony-wait.service chronyd.service >/dev/null 2>&1 || : /bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || : end - + script postup /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/chrpath/chrpath.nm b/chrpath/chrpath.nm index c176c9c..6106930 100644 --- a/chrpath/chrpath.nm +++ b/chrpath/chrpath.nm @@ -32,4 +32,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/clamav/clamav.nm b/clamav/clamav.nm index a3c7473..ae809eb 100644 --- a/clamav/clamav.nm +++ b/clamav/clamav.nm @@ -65,12 +65,16 @@ end packages package %{name} end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cloog-ppl/cloog-ppl.nm b/cloog-ppl/cloog-ppl.nm index d188a15..e8966be 100644 --- a/cloog-ppl/cloog-ppl.nm +++ b/cloog-ppl/cloog-ppl.nm @@ -50,4 +50,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cmake/cmake.nm b/cmake/cmake.nm index 9cfc819..ddbe23a 100644 --- a/cmake/cmake.nm +++ b/cmake/cmake.nm @@ -66,4 +66,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 0f35453..8061fd9 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -80,4 +80,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cpio/cpio.nm b/cpio/cpio.nm index 9ce15f3..7b21d84 100644 --- a/cpio/cpio.nm +++ b/cpio/cpio.nm @@ -36,4 +36,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm index 1695922..6465a45 100644 --- a/cpufrequtils/cpufrequtils.nm +++ b/cpufrequtils/cpufrequtils.nm @@ -32,8 +32,12 @@ packages package %{name} groups += Base end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm index ac71472..f008a9b 100644 --- a/cracklib/cracklib.nm +++ b/cracklib/cracklib.nm @@ -70,27 +70,31 @@ packages package %{name} requires = %{name}-dicts end - + package %{name}-devel template DEVEL end - + # We build an extra package with the dictionaries. package %{name}-dicts summary = Dictionaries for %{thisapp}. description = %{summary} - + files /lib/cracklib /usr/share/dict* end end - + # We build an extra python package with the bindings for it. package python-cracklib summary = Python bindings for ${thisapp}. description = %{summary} - + files = /usr/lib*/python* end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/crda/crda.nm b/crda/crda.nm index d436ca2..16af943 100644 --- a/crda/crda.nm +++ b/crda/crda.nm @@ -42,4 +42,8 @@ packages wireless-regdb end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cronie/cronie.nm b/cronie/cronie.nm index 614d1cb..ae94fa5 100644 --- a/cronie/cronie.nm +++ b/cronie/cronie.nm @@ -34,4 +34,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm index 116aa54..8ac4302 100644 --- a/cryptsetup-luks/cryptsetup-luks.nm +++ b/cryptsetup-luks/cryptsetup-luks.nm @@ -47,8 +47,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/cups/cups.nm b/cups/cups.nm index 3ecdae9..3922594 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -78,14 +78,18 @@ packages package %{name} requires = ghostscript end - + package %{name}-devel template DEVEL requires += %{name}-libs=%{thisver} end - + package %{name}-libs template LIBS end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/curl/curl.nm b/curl/curl.nm index 5a752fd..68a22bf 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -60,12 +60,18 @@ end packages package curl - + package libcurl template LIBS end - + package libcurl-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + + provides += libcurl-debuginfo + end end diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm index b28d402..4609f37 100644 --- a/cyrus-sasl/cyrus-sasl.nm +++ b/cyrus-sasl/cyrus-sasl.nm @@ -50,8 +50,12 @@ packages package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dansguardian/dansguardian.nm b/dansguardian/dansguardian.nm index 4a08335..4ac512b 100644 --- a/dansguardian/dansguardian.nm +++ b/dansguardian/dansguardian.nm @@ -46,4 +46,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/db4/db4.nm b/db4/db4.nm index c0279ba..4fe07f9 100644 --- a/db4/db4.nm +++ b/db4/db4.nm @@ -51,14 +51,14 @@ end packages package db4 - + package db4-devel template DEVEL files += \ !/usr/lib*/libdb-%{version_major}.so end - + package db4-utils summary = Command line tools for managing Berkeley DB (version 4) databases. description = %{summary} @@ -67,7 +67,7 @@ packages /usr/bin end end - + package db4-cxx summary = The Berkeley DB database library (version 4) for C++. description = %{summary} @@ -76,4 +76,8 @@ packages /usr/lib*/libdb_cxx-%{version_major}.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm index c80decc..8054c6d 100644 --- a/dbus-glib/dbus-glib.nm +++ b/dbus-glib/dbus-glib.nm @@ -49,10 +49,14 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires = glib2-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dbus/dbus.nm b/dbus/dbus.nm index 93b7750..7286d06 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -68,9 +68,9 @@ packages # Just search for new unit files that were just installed. script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : - + # The dbus service should be started on default. - /bin/systemctl enable dbus.service > /dev/null 2>&1 || : + /bin/systemctl enable dbus.service > /dev/null 2>&1 || : end # Disable the service that is to be removed and stop it if it is still running. @@ -90,14 +90,18 @@ packages /bin/systemctl try-restart dbus.service >/dev/null 2>&1 || : end end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL - + files += /usr/lib/dbus-1.0 end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm index 52eb826..2c0d195 100644 --- a/dejagnu/dejagnu.nm +++ b/dejagnu/dejagnu.nm @@ -41,7 +41,7 @@ packages package %{name} requires = expect tcl end - + package %{name}-devel template DEVEL end diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index 05dfd2f..507891a 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -16,7 +16,7 @@ description DHCP (Dynamic Host Configuration Protocol) is a protocol which allows individual devices on an IP network to get their own network configuration information (IP address, subnetmask, broadcast address, - etc.) from a DHCP server. The overall purpose of DHCP is to make it + etc.) from a DHCP server. The overall purpose of DHCP is to make it easier to administer a large network. end @@ -189,7 +189,7 @@ packages package %{name}-common summary = Common files used by the dhcp client and server. description = %{summary} - + files /usr/bin/ /usr/share/man/man1/omshell.1* @@ -205,4 +205,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dhcping/dhcping.nm b/dhcping/dhcping.nm index b43cc70..ef2d45c 100644 --- a/dhcping/dhcping.nm +++ b/dhcping/dhcping.nm @@ -27,4 +27,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dialog/dialog.nm b/dialog/dialog.nm index 00fefbf..b46ae2b 100644 --- a/dialog/dialog.nm +++ b/dialog/dialog.nm @@ -57,4 +57,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index 6d575c6..f7b41ec 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -32,4 +32,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/directfb/directfb.nm b/directfb/directfb.nm index 5e777c4..e8d2433 100644 --- a/directfb/directfb.nm +++ b/directfb/directfb.nm @@ -49,4 +49,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm index 43d244a..d42cf91 100644 --- a/dmidecode/dmidecode.nm +++ b/dmidecode/dmidecode.nm @@ -33,4 +33,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index 5b7e58b..9a43c0b 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -57,8 +57,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm index 0adc696..5841054 100644 --- a/docbook-dtds/docbook-dtds.nm +++ b/docbook-dtds/docbook-dtds.nm @@ -78,7 +78,7 @@ build macro_extract docbook-4.4.zip 4.4-sgml macro_extract docbook-xml-4.4.zip 4.4-xml macro_extract docbook-4.5.zip 4.5-sgml - macro_extract docbook-xml-4.5.zip 4.5-xml + macro_extract docbook-xml-4.5.zip 4.5-xml # Convert all catalog files to unix format cd %{DIR_APP} && dos2unix */docbook.cat @@ -197,7 +197,7 @@ packages script postun # remove entries only on removal of package if [ "$1" = 0 ]; then - + entities=" ent/iso-pub.ent ent/iso-grk1.ent diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm index 44a236c..a0bc3f4 100644 --- a/docbook-utils/docbook-utils.nm +++ b/docbook-utils/docbook-utils.nm @@ -50,4 +50,8 @@ packages openjade end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm index 5b0b053..55da321 100644 --- a/dos2unix/dos2unix.nm +++ b/dos2unix/dos2unix.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm index c479619..1ab3d5e 100644 --- a/dosfstools/dosfstools.nm +++ b/dosfstools/dosfstools.nm @@ -31,4 +31,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/dracut/dracut.nm b/dracut/dracut.nm index bedfd4e..8b49f4d 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -60,21 +60,21 @@ packages which end end - + package %{name}-network summary = Network support for the initramdisk. description This package requires everything which is needed to build a generic all purpose initramfs with network support with dracut. end - + requires bridge-utils dhclient iproute2 nfs-utils end - + files /usr/share/dracut/modules.d/40network /usr/share/dracut/modules.d/95fcoe @@ -85,12 +85,12 @@ packages /usr/share/dracut/modules.d/95znet end end - - + + package %{name}-utils summary = Command line utils for dracut. description = %{summary} - + files /sbin/dracut-* /sbin/*initrd diff --git a/dvdrtools/dvdrtools.nm b/dvdrtools/dvdrtools.nm index 5efad8d..efa3490 100644 --- a/dvdrtools/dvdrtools.nm +++ b/dvdrtools/dvdrtools.nm @@ -34,4 +34,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index 7b80dcd..e55ee5d 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -80,8 +80,12 @@ packages package %{name} groups += Base end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm index 3ace478..5235920 100644 --- a/ebtables/ebtables.nm +++ b/ebtables/ebtables.nm @@ -49,4 +49,8 @@ packages libebt end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ed/ed.nm b/ed/ed.nm index f2ddbc7..fe1f115 100644 --- a/ed/ed.nm +++ b/ed/ed.nm @@ -39,4 +39,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/eggdbus/eggdbus.nm b/eggdbus/eggdbus.nm index 502736d..fe15865 100644 --- a/eggdbus/eggdbus.nm +++ b/eggdbus/eggdbus.nm @@ -34,8 +34,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/eject/eject.nm b/eject/eject.nm index e2a7488..7f1e448 100644 --- a/eject/eject.nm +++ b/eject/eject.nm @@ -36,4 +36,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/elfutils/elfutils.nm b/elfutils/elfutils.nm index a94a9f9..a56e6bc 100644 --- a/elfutils/elfutils.nm +++ b/elfutils/elfutils.nm @@ -60,7 +60,7 @@ packages package %{name}-devel template DEVEL - + requires = %{name}=%{thisver} %{name}-libs=%{thisver} end @@ -70,4 +70,8 @@ packages files += /usr/lib*/lib*%{version}.so files += /usr/lib/elfutils end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/elinks/elinks.nm b/elinks/elinks.nm index b17764b..1e7bc51 100644 --- a/elinks/elinks.nm +++ b/elinks/elinks.nm @@ -44,4 +44,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/etherwake/etherwake.nm b/etherwake/etherwake.nm index 5ceab2a..57728b7 100644 --- a/etherwake/etherwake.nm +++ b/etherwake/etherwake.nm @@ -34,4 +34,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm index dfbca0e..ce61a72 100644 --- a/ethtool/ethtool.nm +++ b/ethtool/ethtool.nm @@ -28,4 +28,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/expat/expat.nm b/expat/expat.nm index dc13fc7..d03a8bc 100644 --- a/expat/expat.nm +++ b/expat/expat.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/expect/expect.nm b/expect/expect.nm index eea2632..0648f33 100644 --- a/expect/expect.nm +++ b/expect/expect.nm @@ -53,4 +53,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ez-ipupdate/ez-ipupdate.nm b/ez-ipupdate/ez-ipupdate.nm index a91cdc4..4d92b79 100644 --- a/ez-ipupdate/ez-ipupdate.nm +++ b/ez-ipupdate/ez-ipupdate.nm @@ -28,4 +28,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/fail2ban/fail2ban.nm b/fail2ban/fail2ban.nm index 0d204e0..38ad03b 100644 --- a/fail2ban/fail2ban.nm +++ b/fail2ban/fail2ban.nm @@ -40,4 +40,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/file/file.nm b/file/file.nm index fc990ef..fc45b81 100644 --- a/file/file.nm +++ b/file/file.nm @@ -42,4 +42,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm index f5668ef..cb010b4 100644 --- a/filesystem/filesystem.nm +++ b/filesystem/filesystem.nm @@ -88,8 +88,8 @@ build chown root:mail %{BUILDROOT}/var/spool/mail chmod 775 %{BUILDROOT}/var/spool/mail end - - # XXX not implemented at the moment + + # XXX not implemented at the moment export QUALITY_AGENT_NO_DIRECTORY_CHECK = yes export QUALITY_AGENT_NO_DIRECTORY_PRUNE = yes end @@ -98,4 +98,7 @@ packages package %{name} prerequires = setup end + + # Although this package is not noarch, it does not + # contain any binary data and thus has no debuginfo package. end diff --git a/findutils/findutils.nm b/findutils/findutils.nm index 335aa68..8e840ca 100644 --- a/findutils/findutils.nm +++ b/findutils/findutils.nm @@ -47,4 +47,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/firewall/firewall.nm b/firewall/firewall.nm index 6e3cd35..53b3c8f 100644 --- a/firewall/firewall.nm +++ b/firewall/firewall.nm @@ -41,4 +41,8 @@ packages package %{name} requires = iproute2 iptables end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/flex/flex.nm b/flex/flex.nm index 30df439..2993e4f 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -54,8 +54,12 @@ packages package %{name} requires = m4 end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm index 666165c..5520cbb 100644 --- a/fontconfig/fontconfig.nm +++ b/fontconfig/fontconfig.nm @@ -37,8 +37,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm index 62b7289..a9ea8be 100644 --- a/freeradius/freeradius.nm +++ b/freeradius/freeradius.nm @@ -112,16 +112,16 @@ packages script prein %{create_user} end - + script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : end - + script preun /bin/systemctl --no-reload disable freeradius.service >/dev/null 2>&1 || : /bin/systemctl stop freeradius.service >/dev/null 2>&1 || : end - + script postup /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl try-restart freeradius.service >/dev/null 2>&1 || : @@ -152,4 +152,8 @@ packages /usr/share/man/man8/rlm_ippool_tool.8 end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/freetype/freetype.nm b/freetype/freetype.nm index f8aaa8c..c0a2c2c 100644 --- a/freetype/freetype.nm +++ b/freetype/freetype.nm @@ -33,8 +33,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/fuse-sshfs/fuse-sshfs.nm b/fuse-sshfs/fuse-sshfs.nm index ac13780..fab5b72 100644 --- a/fuse-sshfs/fuse-sshfs.nm +++ b/fuse-sshfs/fuse-sshfs.nm @@ -37,4 +37,8 @@ packages provides = sshfs=%{thisver} requires = openssh-clients end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/fuse/fuse.nm b/fuse/fuse.nm index e8fe47d..4974a39 100644 --- a/fuse/fuse.nm +++ b/fuse/fuse.nm @@ -43,8 +43,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gawk/gawk.nm b/gawk/gawk.nm index 835aef2..d64c620 100644 --- a/gawk/gawk.nm +++ b/gawk/gawk.nm @@ -51,4 +51,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 9588701..8fd265a 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -294,4 +294,8 @@ packages /usr/lib/libquadmath*.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gdb/gdb.nm b/gdb/gdb.nm index c1f7240..8ad9a5a 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -78,4 +78,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gdbm/gdbm.nm b/gdbm/gdbm.nm index 30404d3..9362e70 100644 --- a/gdbm/gdbm.nm +++ b/gdbm/gdbm.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm index 35172b7..7fa3659 100644 --- a/gdk-pixbuf2/gdk-pixbuf2.nm +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 0732fdf..2ba29cd 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -47,7 +47,7 @@ end packages package %{name} - + package %{name}-devel template DEVEL @@ -65,4 +65,8 @@ packages /usr/lib/preloadable_libintl.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index b310900..f58df70 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -41,4 +41,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/git/git.nm b/git/git.nm index 2317c87..7501f7d 100644 --- a/git/git.nm +++ b/git/git.nm @@ -27,6 +27,7 @@ build gettext libcurl-devel openssl-devel + perl-ExtUtils-MakeMaker perl-devel zlib-devel end @@ -62,6 +63,10 @@ packages rsync /usr/bin/vi end - + + end + + package %{name}-debuginfo + template DEBUGINFO end end diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 04efcba..67c7fb0 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -57,4 +57,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/glibc/glibc.nm b/glibc/glibc.nm index efd031c..88ceb39 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -249,7 +249,7 @@ end packages package glibc - requires = glibc-common=%{thisver} + requires = glibc-common=%{thisver} end package glibc-common @@ -339,4 +339,8 @@ packages /usr/lib/libpcprofile.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gmp/gmp.nm b/gmp/gmp.nm index 7a5f24e..6348b9f 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -170,4 +170,8 @@ packages /usr/lib/libgmp.so.3* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm index 6623359..d5b10b8 100644 --- a/gnupg2/gnupg2.nm +++ b/gnupg2/gnupg2.nm @@ -41,4 +41,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index b316dec..4414df6 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -53,4 +53,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm index fc9232e..9c9cd16 100644 --- a/gobject-introspection/gobject-introspection.nm +++ b/gobject-introspection/gobject-introspection.nm @@ -48,10 +48,14 @@ packages package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL - + requires = %{name}=%{thisver} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gperf/gperf.nm b/gperf/gperf.nm index add112c..acdd33b 100644 --- a/gperf/gperf.nm +++ b/gperf/gperf.nm @@ -32,4 +32,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/grep/grep.nm b/grep/grep.nm index 1a1a138..348d8a4 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/groff/groff.nm b/groff/groff.nm index 344e745..1a4fa8c 100644 --- a/groff/groff.nm +++ b/groff/groff.nm @@ -72,4 +72,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/grub/grub.nm b/grub/grub.nm index 409ce33..6b9ab69 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -84,4 +84,8 @@ packages --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/grubby/grubby.nm b/grubby/grubby.nm index 894b5a2..92c1a58 100644 --- a/grubby/grubby.nm +++ b/grubby/grubby.nm @@ -13,10 +13,10 @@ license = GPLv2+ summary = Command line tool for updating bootloader configs. description - grubby is a command line tool for updating and displaying information about - the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) + grubby is a command line tool for updating and displaying information about + the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) and zipl (s390) boot loaders. It is primarily designed to be used from scripts - which install new kernels and need to find information about the current boot + which install new kernels and need to find information about the current boot environment. end @@ -39,4 +39,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gssdp/gssdp.nm b/gssdp/gssdp.nm index 792f872..6331c7c 100644 --- a/gssdp/gssdp.nm +++ b/gssdp/gssdp.nm @@ -29,8 +29,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/guile/guile.nm b/guile/guile.nm index ef8e08f..3c72e70 100644 --- a/guile/guile.nm +++ b/guile/guile.nm @@ -50,4 +50,8 @@ packages requires = gmp-devel libtool-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gupnp-av/gupnp-av.nm b/gupnp-av/gupnp-av.nm index 18c8e25..d6f3917 100644 --- a/gupnp-av/gupnp-av.nm +++ b/gupnp-av/gupnp-av.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gupnp-igd/gupnp-igd.nm b/gupnp-igd/gupnp-igd.nm index e84c0a6..dd0981a 100644 --- a/gupnp-igd/gupnp-igd.nm +++ b/gupnp-igd/gupnp-igd.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gupnp/gupnp.nm b/gupnp/gupnp.nm index 5dd403a..02a28ed 100644 --- a/gupnp/gupnp.nm +++ b/gupnp/gupnp.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/gzip/gzip.nm b/gzip/gzip.nm index b3d2baa..ca3970b 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -47,4 +47,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index 4ccd35f..be51efd 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -33,4 +33,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/help2man/help2man.nm b/help2man/help2man.nm index 208f1ff..a1ded21 100644 --- a/help2man/help2man.nm +++ b/help2man/help2man.nm @@ -34,4 +34,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index 9600139..507c0ea 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -47,4 +47,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/hplip/hplip.nm b/hplip/hplip.nm index 16eb31d..cd3a8a2 100644 --- a/hplip/hplip.nm +++ b/hplip/hplip.nm @@ -45,4 +45,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/htop/htop.nm b/htop/htop.nm index db39ba0..24e8590 100644 --- a/htop/htop.nm +++ b/htop/htop.nm @@ -35,4 +35,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ibod/ibod.nm b/ibod/ibod.nm index 84f4111..964881b 100644 --- a/ibod/ibod.nm +++ b/ibod/ibod.nm @@ -46,7 +46,7 @@ packages # There isn't any chance at the moment to determine the names of # spawned instances by a systemd service file. # - # So we aren't able to stop any ibod process before uninstalling the package. + # So we aren't able to stop any ibod process before uninstalling the package. script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : end @@ -59,4 +59,8 @@ packages /bin/systemctl daemon-reload >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/icecream/icecream.nm b/icecream/icecream.nm index be1ee15..d41e4e0 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -112,8 +112,12 @@ packages icecc-scheduler.service >/dev/null 2>&1 || : end end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iftop/iftop.nm b/iftop/iftop.nm index bee6dac..b6c651f 100644 --- a/iftop/iftop.nm +++ b/iftop/iftop.nm @@ -33,4 +33,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/igmpproxy/igmpproxy.nm b/igmpproxy/igmpproxy.nm index 41cff18..12e842c 100644 --- a/igmpproxy/igmpproxy.nm +++ b/igmpproxy/igmpproxy.nm @@ -28,4 +28,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index 08850f8..2dc0203 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -103,4 +103,8 @@ packages /bin/systemctl daemon-reload >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iperf/iperf.nm b/iperf/iperf.nm index 3a79375..d7612c5 100644 --- a/iperf/iperf.nm +++ b/iperf/iperf.nm @@ -30,4 +30,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 14fe817..2260815 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -42,4 +42,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iptables/iptables.nm b/iptables/iptables.nm index 771397d..ef8c3d0 100644 --- a/iptables/iptables.nm +++ b/iptables/iptables.nm @@ -79,8 +79,12 @@ packages package %{name} groups += Base end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iputils/iputils.nm b/iputils/iputils.nm index 4616ba2..52594ae 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -81,4 +81,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm index 01e61c8..ac1dbd4 100644 --- a/iscsi-initiator-utils/iscsi-initiator-utils.nm +++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm @@ -78,21 +78,25 @@ end packages package %{name} end - + package libiscsi template LIBS - + files /usr/lib*/libiscsi.so.* end end - + package libiscsi-devel template DEVEL - + files /usr/lib/libiscsi.so /usr/include end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm index 3928e0b..49998d5 100644 --- a/isdn4k-utils/isdn4k-utils.nm +++ b/isdn4k-utils/isdn4k-utils.nm @@ -16,7 +16,7 @@ summary = Utilities for configuring an ISDN subsystem. description The isdn4k-utils package contains a collection of utilities needed - for configuring and running an ISDN subsystem. + for configuring and running an ISDN subsystem. end source_dl = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/ @@ -38,7 +38,7 @@ build -D_LARGEFILE_SOURCE prepare_cmds - # remove useless files + # remove useless files find -type d -name CVS | xargs rm -rf # enable capi20.new @@ -61,9 +61,9 @@ build echo "CONFIG_FAQ=y" >> .config echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config - echo "LIBDIR='/usr/lib'" >> .config - echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config - echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config + echo "LIBDIR='/usr/lib'" >> .config + echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config + echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config sed -e "s,',,g" .config > .config.h end @@ -114,4 +114,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/iw/iw.nm b/iw/iw.nm index ff42e14..55e5ffd 100644 --- a/iw/iw.nm +++ b/iw/iw.nm @@ -36,4 +36,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/joe/joe.nm b/joe/joe.nm index e3cc1bb..ecc5149 100644 --- a/joe/joe.nm +++ b/joe/joe.nm @@ -31,4 +31,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/jwhois/jwhois.nm b/jwhois/jwhois.nm index 607a0ad..5fcf81a 100644 --- a/jwhois/jwhois.nm +++ b/jwhois/jwhois.nm @@ -42,4 +42,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/kbd/kbd.nm b/kbd/kbd.nm index e521a60..2fe9da1 100644 --- a/kbd/kbd.nm +++ b/kbd/kbd.nm @@ -72,4 +72,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/keepalived/keepalived.nm b/keepalived/keepalived.nm index b05f158..8c825a3 100644 --- a/keepalived/keepalived.nm +++ b/keepalived/keepalived.nm @@ -72,4 +72,8 @@ packages /bin/systemctl try-restart keepalived.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm index 75d397c..63c5d9e 100644 --- a/ldapvi/ldapvi.nm +++ b/ldapvi/ldapvi.nm @@ -46,4 +46,8 @@ packages package %{name} requires = vim end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/less/less.nm b/less/less.nm index 2e95742..3fa280e 100644 --- a/less/less.nm +++ b/less/less.nm @@ -46,4 +46,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libICE/libICE.nm b/libICE/libICE.nm index 8ec2d82..6b2c67e 100644 --- a/libICE/libICE.nm +++ b/libICE/libICE.nm @@ -34,8 +34,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libSM/libSM.nm b/libSM/libSM.nm index 7c6cc8c..2aae4d1 100644 --- a/libSM/libSM.nm +++ b/libSM/libSM.nm @@ -35,8 +35,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm index db77f0c..e4dfc15 100644 --- a/libVNCServer/libVNCServer.nm +++ b/libVNCServer/libVNCServer.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libX11/libX11.nm b/libX11/libX11.nm index f705a48..12ceb7c 100644 --- a/libX11/libX11.nm +++ b/libX11/libX11.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXau/libXau.nm b/libXau/libXau.nm index d35344b..920f882 100644 --- a/libXau/libXau.nm +++ b/libXau/libXau.nm @@ -41,8 +41,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXaw/libXaw.nm b/libXaw/libXaw.nm index 084330a..0fb6d25 100644 --- a/libXaw/libXaw.nm +++ b/libXaw/libXaw.nm @@ -40,8 +40,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm index f8c2af7..b1f54cc 100644 --- a/libXdamage/libXdamage.nm +++ b/libXdamage/libXdamage.nm @@ -35,8 +35,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm index b5a5212..352a36e 100644 --- a/libXdmcp/libXdmcp.nm +++ b/libXdmcp/libXdmcp.nm @@ -33,8 +33,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXext/libXext.nm b/libXext/libXext.nm index 5c65c16..daa5ddc 100644 --- a/libXext/libXext.nm +++ b/libXext/libXext.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm index 8ceb642..561b928 100644 --- a/libXfixes/libXfixes.nm +++ b/libXfixes/libXfixes.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXfont/libXfont.nm b/libXfont/libXfont.nm index 42236ac..27ef216 100644 --- a/libXfont/libXfont.nm +++ b/libXfont/libXfont.nm @@ -37,8 +37,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXft/libXft.nm b/libXft/libXft.nm index 171ca07..e1bea3b 100644 --- a/libXft/libXft.nm +++ b/libXft/libXft.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXi/libXi.nm b/libXi/libXi.nm index 97dba75..45337e4 100644 --- a/libXi/libXi.nm +++ b/libXi/libXi.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXmu/libXmu.nm b/libXmu/libXmu.nm index 80328ac..2c0b86c 100644 --- a/libXmu/libXmu.nm +++ b/libXmu/libXmu.nm @@ -39,8 +39,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXpm/libXpm.nm b/libXpm/libXpm.nm index ce78a7e..406d342 100644 --- a/libXpm/libXpm.nm +++ b/libXpm/libXpm.nm @@ -40,8 +40,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm index d4d9fdd..4076515 100644 --- a/libXrandr/libXrandr.nm +++ b/libXrandr/libXrandr.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXrender/libXrender.nm b/libXrender/libXrender.nm index b622d9a..c9ee5b4 100644 --- a/libXrender/libXrender.nm +++ b/libXrender/libXrender.nm @@ -34,8 +34,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXres/libXres.nm b/libXres/libXres.nm index d03e476..d732b51 100644 --- a/libXres/libXres.nm +++ b/libXres/libXres.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXt/libXt.nm b/libXt/libXt.nm index 7bc1eae..69bb3c9 100644 --- a/libXt/libXt.nm +++ b/libXt/libXt.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXtst/libXtst.nm b/libXtst/libXtst.nm index 68b4c10..d44de71 100644 --- a/libXtst/libXtst.nm +++ b/libXtst/libXtst.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXv/libXv.nm b/libXv/libXv.nm index 50fb007..8583fb2 100644 --- a/libXv/libXv.nm +++ b/libXv/libXv.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm index d552db0..7fbd0be 100644 --- a/libXvMC/libXvMC.nm +++ b/libXvMC/libXvMC.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm index b850e10..5e7ad7e 100644 --- a/libXxf86vm/libXxf86vm.nm +++ b/libXxf86vm/libXxf86vm.nm @@ -35,8 +35,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libaal/libaal.nm b/libaal/libaal.nm index e549015..2287807 100644 --- a/libaal/libaal.nm +++ b/libaal/libaal.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libaio/libaio.nm b/libaio/libaio.nm index 9ea6137..30208d8 100644 --- a/libaio/libaio.nm +++ b/libaio/libaio.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm index 1bd8632..ea30615 100644 --- a/libarchive/libarchive.nm +++ b/libarchive/libarchive.nm @@ -47,8 +47,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libart/libart.nm b/libart/libart.nm index ced0ca9..ec47dfd 100644 --- a/libart/libart.nm +++ b/libart/libart.nm @@ -23,8 +23,12 @@ sources = %{thisapp}.tar.bz2 packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libassuan/libassuan.nm b/libassuan/libassuan.nm index d120ce0..7bce1b3 100644 --- a/libassuan/libassuan.nm +++ b/libassuan/libassuan.nm @@ -41,8 +41,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm index 6bbf115..78c510e 100644 --- a/libatasmart/libatasmart.nm +++ b/libatasmart/libatasmart.nm @@ -41,8 +41,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm index 057bae6..fae925b 100644 --- a/libcap-ng/libcap-ng.nm +++ b/libcap-ng/libcap-ng.nm @@ -43,8 +43,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libcap/libcap.nm b/libcap/libcap.nm index 5929843..a094f1e 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -49,4 +49,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm index 893b555..33a01f3 100644 --- a/libcgroup/libcgroup.nm +++ b/libcgroup/libcgroup.nm @@ -50,8 +50,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libcroco/libcroco.nm b/libcroco/libcroco.nm index 4b775ba..8b5cb5d 100644 --- a/libcroco/libcroco.nm +++ b/libcroco/libcroco.nm @@ -9,7 +9,7 @@ major_ver = 0.6 release = 1 groups = System/Libraries -url = +url = license = LGPLv2+ summary = A CSS2 parsing library. @@ -34,8 +34,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libdaemon/libdaemon.nm b/libdaemon/libdaemon.nm index 6a15149..84ebf82 100644 --- a/libdaemon/libdaemon.nm +++ b/libdaemon/libdaemon.nm @@ -27,8 +27,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libdnet/libdnet.nm b/libdnet/libdnet.nm index e770669..65036b3 100644 --- a/libdnet/libdnet.nm +++ b/libdnet/libdnet.nm @@ -37,8 +37,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm index 40efa2a..007090a 100644 --- a/libdrm/libdrm.nm +++ b/libdrm/libdrm.nm @@ -51,8 +51,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libedit/libedit.nm b/libedit/libedit.nm index 4cd5305..a481ede 100644 --- a/libedit/libedit.nm +++ b/libedit/libedit.nm @@ -40,10 +40,14 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires = ncurses-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libevent/libevent.nm b/libevent/libevent.nm index b0d4f12..4add6aa 100644 --- a/libevent/libevent.nm +++ b/libevent/libevent.nm @@ -35,8 +35,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libffi/libffi.nm b/libffi/libffi.nm index ea4cafd..284af95 100644 --- a/libffi/libffi.nm +++ b/libffi/libffi.nm @@ -23,10 +23,14 @@ source_dl = packages package %{name} end - + package %{name}-devel template DEVEL - + files += /usr/lib*/libffi-%{version} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm index 679bb90..5009601 100644 --- a/libfontenc/libfontenc.nm +++ b/libfontenc/libfontenc.nm @@ -33,8 +33,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm index 708cfd1..9fd1159 100644 --- a/libgcrypt/libgcrypt.nm +++ b/libgcrypt/libgcrypt.nm @@ -41,10 +41,14 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires = libgpg-error-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libgpg-error/libgpg-error.nm b/libgpg-error/libgpg-error.nm index 637b9c2..9e59252 100644 --- a/libgpg-error/libgpg-error.nm +++ b/libgpg-error/libgpg-error.nm @@ -39,8 +39,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libgssglue/libgssglue.nm b/libgssglue/libgssglue.nm index 24ce555..90a197a 100644 --- a/libgssglue/libgssglue.nm +++ b/libgssglue/libgssglue.nm @@ -23,8 +23,12 @@ source_dl = packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libidn/libidn.nm b/libidn/libidn.nm index 35109f7..7de885f 100644 --- a/libidn/libidn.nm +++ b/libidn/libidn.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm index ff129c4..b9d9903 100644 --- a/libjpeg/libjpeg.nm +++ b/libjpeg/libjpeg.nm @@ -51,8 +51,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libksba/libksba.nm b/libksba/libksba.nm index 63ecf93..d5ce071 100644 --- a/libksba/libksba.nm +++ b/libksba/libksba.nm @@ -29,8 +29,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libmng/libmng.nm b/libmng/libmng.nm index e4819aa..5b0ba8e 100644 --- a/libmng/libmng.nm +++ b/libmng/libmng.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index 5c351bd..9f51969 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -42,4 +42,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnet/libnet.nm b/libnet/libnet.nm index fa368c4..01c84dc 100644 --- a/libnet/libnet.nm +++ b/libnet/libnet.nm @@ -26,8 +26,12 @@ source_dl = packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm index 40a8b9b..b2e3ee2 100644 --- a/libnetfilter_conntrack/libnetfilter_conntrack.nm +++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm @@ -31,8 +31,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm index ad6bd92..988f450 100644 --- a/libnetfilter_log/libnetfilter_log.nm +++ b/libnetfilter_log/libnetfilter_log.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnetfilter_queue/libnetfilter_queue.nm b/libnetfilter_queue/libnetfilter_queue.nm index ee20f9b..50e6097 100644 --- a/libnetfilter_queue/libnetfilter_queue.nm +++ b/libnetfilter_queue/libnetfilter_queue.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnfnetlink/libnfnetlink.nm b/libnfnetlink/libnfnetlink.nm index 70756bc..411a22d 100644 --- a/libnfnetlink/libnfnetlink.nm +++ b/libnfnetlink/libnfnetlink.nm @@ -26,8 +26,12 @@ sources = %{thisapp}.tar.bz2 packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm index eb7894d..f4ee0e1 100644 --- a/libnfsidmap/libnfsidmap.nm +++ b/libnfsidmap/libnfsidmap.nm @@ -48,8 +48,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnl/libnl.nm b/libnl/libnl.nm index a8d3cae..6e642e4 100644 --- a/libnl/libnl.nm +++ b/libnl/libnl.nm @@ -35,8 +35,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libpcap/libpcap.nm b/libpcap/libpcap.nm index 372b1ed..fbb8d25 100644 --- a/libpcap/libpcap.nm +++ b/libpcap/libpcap.nm @@ -40,8 +40,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm index 4a4b1ca..1caed55 100644 --- a/libpciaccess/libpciaccess.nm +++ b/libpciaccess/libpciaccess.nm @@ -29,8 +29,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libpipeline/libpipeline.nm b/libpipeline/libpipeline.nm index 3213e68..c536452 100644 --- a/libpipeline/libpipeline.nm +++ b/libpipeline/libpipeline.nm @@ -22,8 +22,12 @@ source_dl = packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libpng/libpng.nm b/libpng/libpng.nm index 31fdf84..3841816 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -35,7 +35,11 @@ packages package %{name}-devel template DEVEL - + requires = zlib-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/librpcsecgss/librpcsecgss.nm b/librpcsecgss/librpcsecgss.nm index 5c2d073..6d6283a 100644 --- a/librpcsecgss/librpcsecgss.nm +++ b/librpcsecgss/librpcsecgss.nm @@ -29,8 +29,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm index 92f6ea5..42d4129 100644 --- a/librsvg2/librsvg2.nm +++ b/librsvg2/librsvg2.nm @@ -9,7 +9,7 @@ major_ver = 2.34 release = 1 groups = System/Libraries -url = +url = license = LGPLv2+ summary = A SVG library based on cairo. @@ -39,8 +39,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm index ebffd37..6e48114 100644 --- a/libselinux/libselinux.nm +++ b/libselinux/libselinux.nm @@ -64,11 +64,11 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end - + package %{name}-utils summary = SELinux libselinux utitlities. description @@ -80,7 +80,7 @@ packages /usr/share/man/man{5,8}/* end end - + #package python-selinux # summary = SELinux python bindings. # description = SELinux python bindings for libselinux. @@ -89,6 +89,10 @@ packages # /usr/lib/python* # end #end - - + + + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libsemanage/libsemanage.nm b/libsemanage/libsemanage.nm index f543595..348f335 100644 --- a/libsemanage/libsemanage.nm +++ b/libsemanage/libsemanage.nm @@ -50,17 +50,21 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end - + package python-selinux-manage summary = SELinux manage python bindings. description = SELinux python bindings for libsemanage. - + files /usr/lib/python* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index dbecc79..ee6efd1 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libsigc++/libsigc++.nm b/libsigc++/libsigc++.nm index e672087..eab0251 100644 --- a/libsigc++/libsigc++.nm +++ b/libsigc++/libsigc++.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 22455af..aade3f9 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -67,8 +67,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm index f91b31d..868ced3 100644 --- a/libsoup/libsoup.nm +++ b/libsoup/libsoup.nm @@ -38,10 +38,14 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires = libxml2-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libssh2/libssh2.nm b/libssh2/libssh2.nm index 351fcd5..16312fc 100644 --- a/libssh2/libssh2.nm +++ b/libssh2/libssh2.nm @@ -39,8 +39,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm index 8ffb47b..b130a59 100644 --- a/libtasn1/libtasn1.nm +++ b/libtasn1/libtasn1.nm @@ -28,8 +28,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libtiff/libtiff.nm b/libtiff/libtiff.nm index 876d121..3aa9931 100644 --- a/libtiff/libtiff.nm +++ b/libtiff/libtiff.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libtool/libtool.nm b/libtool/libtool.nm index a8c6c13..cd72e6d 100644 --- a/libtool/libtool.nm +++ b/libtool/libtool.nm @@ -34,4 +34,8 @@ packages # /usr/share/aclocal must be in main package. files += !/usr/share/aclocal end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm index b989dab..9cbeb8c 100644 --- a/libtorrent/libtorrent.nm +++ b/libtorrent/libtorrent.nm @@ -30,8 +30,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libusb-compat/libusb-compat.nm b/libusb-compat/libusb-compat.nm index 909c6d7..bd36891 100644 --- a/libusb-compat/libusb-compat.nm +++ b/libusb-compat/libusb-compat.nm @@ -44,8 +44,12 @@ end packages package %{name}-compat end - + package %{name}-compat-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libusb/libusb.nm b/libusb/libusb.nm index 6bbf64b..5be7758 100644 --- a/libusb/libusb.nm +++ b/libusb/libusb.nm @@ -27,8 +27,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libuser/libuser.nm b/libuser/libuser.nm index 12db984..cc2e961 100644 --- a/libuser/libuser.nm +++ b/libuser/libuser.nm @@ -47,8 +47,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index 90d50a6..a094388 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -76,8 +76,12 @@ packages /bin/umount end end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libxcb/libxcb.nm b/libxcb/libxcb.nm index a96db90..c5713b0 100644 --- a/libxcb/libxcb.nm +++ b/libxcb/libxcb.nm @@ -46,10 +46,14 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires = libXau-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm index 6fa7cf4..6084282 100644 --- a/libxkbfile/libxkbfile.nm +++ b/libxkbfile/libxkbfile.nm @@ -38,8 +38,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libxml2/libxml2.nm b/libxml2/libxml2.nm index 322e60b..3d6bb8e 100644 --- a/libxml2/libxml2.nm +++ b/libxml2/libxml2.nm @@ -36,8 +36,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libxslt/libxslt.nm b/libxslt/libxslt.nm index 8a12e80..5566cfe 100644 --- a/libxslt/libxslt.nm +++ b/libxslt/libxslt.nm @@ -33,8 +33,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm index 420920d..f945f23 100644 --- a/libyaml/libyaml.nm +++ b/libyaml/libyaml.nm @@ -32,8 +32,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lighttpd/lighttpd.nm b/lighttpd/lighttpd.nm index 1fb927d..ade0c47 100644 --- a/lighttpd/lighttpd.nm +++ b/lighttpd/lighttpd.nm @@ -72,25 +72,29 @@ packages configfiles /etc/lighttpd.conf end - + prerequires = shadow-utils systemd-units script prein %{create_user} end - + script postin /bin/systemctl daemon-reload >/dev/null 2>&1 || : end - + script preun /bin/systemctl --no-reload disable lighttpd.service >/dev/null 2>&1 || : /bin/systemctl stop lighttpd.service >/dev/null 2>&1 || : end - + script postup /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl try-restart lighttpd.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm index 9970c29..428e21f 100644 --- a/linux-atm/linux-atm.nm +++ b/linux-atm/linux-atm.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index f83462e..d1ac240 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -36,4 +36,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm index 3521db8..7cce877 100644 --- a/lldpd/lldpd.nm +++ b/lldpd/lldpd.nm @@ -75,4 +75,8 @@ packages /bin/systemctl try-restart lldpd.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm index f686653..20114ca 100644 --- a/lm-sensors/lm-sensors.nm +++ b/lm-sensors/lm-sensors.nm @@ -42,4 +42,8 @@ packages package %{name} requires = perl rrdtool end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/logrotate/logrotate.nm b/logrotate/logrotate.nm index 9b083c9..cdafc91 100644 --- a/logrotate/logrotate.nm +++ b/logrotate/logrotate.nm @@ -54,4 +54,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lsof/lsof.nm b/lsof/lsof.nm index 527e45a..d28871a 100644 --- a/lsof/lsof.nm +++ b/lsof/lsof.nm @@ -46,4 +46,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lua/lua.nm b/lua/lua.nm index b27d238..a08ea63 100644 --- a/lua/lua.nm +++ b/lua/lua.nm @@ -58,14 +58,18 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end - + package %{name}-libs template LIBS - + files += /usr/lib*/liblua-5.1.so end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index 0612e02..5c033c0 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -52,12 +52,16 @@ end packages package %{name} end - + package libdevmapper template LIBS end - + package libdevmapper-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/lzo/lzo.nm b/lzo/lzo.nm index 917afd0..71696af 100644 --- a/lzo/lzo.nm +++ b/lzo/lzo.nm @@ -38,4 +38,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/m4/m4.nm b/m4/m4.nm index cd2c64d..d49cb96 100644 --- a/m4/m4.nm +++ b/m4/m4.nm @@ -32,4 +32,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/make/make.nm b/make/make.nm index da9192a..c8eac07 100644 --- a/make/make.nm +++ b/make/make.nm @@ -37,4 +37,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/man-db/man-db.nm b/man-db/man-db.nm index 2d6ad4c..05b9e66 100644 --- a/man-db/man-db.nm +++ b/man-db/man-db.nm @@ -66,4 +66,8 @@ packages man end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/mc/mc.nm b/mc/mc.nm index 975c501..587eb11 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -13,7 +13,7 @@ license = GPLv2+ summary = User-friendly text console file manager and visual shell. description - Midnight Commander is a visual shell much like a file manager, only + Midnight Commander is a visual shell much like a file manager, only with many more features. It is a text mode application, but it also includes mouse support. Midnight Commander's best features are its ability to FTP, view tar and zip files, and to poke into RPMs for @@ -53,4 +53,8 @@ packages perl$pieces$ end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm index 165ee40..8e0073e 100644 --- a/mdadm/mdadm.nm +++ b/mdadm/mdadm.nm @@ -48,8 +48,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm index dd024d3..8664482 100644 --- a/memtest86+/memtest86+.nm +++ b/memtest86+/memtest86+.nm @@ -40,4 +40,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/mesa/mesa.nm b/mesa/mesa.nm index aa7c73e..31dafc6 100644 --- a/mesa/mesa.nm +++ b/mesa/mesa.nm @@ -69,4 +69,8 @@ packages libX11-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/minicom/minicom.nm b/minicom/minicom.nm index 3ab7867..a8add8b 100644 --- a/minicom/minicom.nm +++ b/minicom/minicom.nm @@ -33,4 +33,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm index 06d8f6e..af61c1b 100644 --- a/module-init-tools/module-init-tools.nm +++ b/module-init-tools/module-init-tools.nm @@ -45,4 +45,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index 87d4dbe..848d037 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -43,7 +43,7 @@ end packages package %{name} - + package %{name}-devel template DEVEL end @@ -57,4 +57,8 @@ packages /usr/lib/libmpfr.so.1* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm index 11698f3..8eb7c80 100644 --- a/mstpd/mstpd.nm +++ b/mstpd/mstpd.nm @@ -54,4 +54,8 @@ packages /bin/systemctl try-restart mstpd.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/multipath-tools/multipath-tools.nm b/multipath-tools/multipath-tools.nm index ec7b499..57c0103 100644 --- a/multipath-tools/multipath-tools.nm +++ b/multipath-tools/multipath-tools.nm @@ -38,8 +38,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nano/nano.nm b/nano/nano.nm index 7e88a8c..8a69aad 100644 --- a/nano/nano.nm +++ b/nano/nano.nm @@ -38,4 +38,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nasm/nasm.nm b/nasm/nasm.nm index 8fc7336..9244b0a 100644 --- a/nasm/nasm.nm +++ b/nasm/nasm.nm @@ -31,4 +31,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 3707d4a..7edeba2 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -121,15 +121,15 @@ end packages package %{name} - + package %{name}-libs template LIBS - + requires %{name}-base=%{thisver} end end - + package %{name}-devel template DEVEL end @@ -193,4 +193,8 @@ packages /usr/share/terminfo/*/xterm xterm-* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm index 351662a..863fedb 100644 --- a/net-snmp/net-snmp.nm +++ b/net-snmp/net-snmp.nm @@ -62,4 +62,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm index 46bf2f0..084d5d8 100644 --- a/net-tools/net-tools.nm +++ b/net-tools/net-tools.nm @@ -152,4 +152,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/netplug/netplug.nm b/netplug/netplug.nm index 302cf70..8c76e0a 100644 --- a/netplug/netplug.nm +++ b/netplug/netplug.nm @@ -40,4 +40,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nettle/nettle.nm b/nettle/nettle.nm index b34378c..af0a929 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -44,4 +44,8 @@ packages requires += gmp-devel end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/newt/newt.nm b/newt/newt.nm index 5632b2f..e1092b7 100644 --- a/newt/newt.nm +++ b/newt/newt.nm @@ -65,4 +65,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index dbf24b7..e75e28a 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -54,4 +54,8 @@ packages util-linux end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nmap/nmap.nm b/nmap/nmap.nm index a439ed1..4df52f7 100644 --- a/nmap/nmap.nm +++ b/nmap/nmap.nm @@ -40,4 +40,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/noip/noip.nm b/noip/noip.nm index 16eaab2..ff23279 100644 --- a/noip/noip.nm +++ b/noip/noip.nm @@ -34,4 +34,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nspr/nspr.nm b/nspr/nspr.nm index 8e84280..15a533a 100644 --- a/nspr/nspr.nm +++ b/nspr/nspr.nm @@ -95,4 +95,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nss-myhostname/nss-myhostname.nm b/nss-myhostname/nss-myhostname.nm index 9573d49..52d64ce 100644 --- a/nss-myhostname/nss-myhostname.nm +++ b/nss-myhostname/nss-myhostname.nm @@ -45,4 +45,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nss-softokn/nss-softokn.nm b/nss-softokn/nss-softokn.nm index 2dc0cdd..fae15df 100644 --- a/nss-softokn/nss-softokn.nm +++ b/nss-softokn/nss-softokn.nm @@ -123,4 +123,8 @@ packages /usr/lib/pkgconfig end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nss-util/nss-util.nm b/nss-util/nss-util.nm index 3ae22ba..00eb9ce 100644 --- a/nss-util/nss-util.nm +++ b/nss-util/nss-util.nm @@ -101,4 +101,8 @@ packages /usr/lib/pkgconfig end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nss/nss.nm b/nss/nss.nm index 8ccc9b6..584e28e 100644 --- a/nss/nss.nm +++ b/nss/nss.nm @@ -63,7 +63,7 @@ build # Extract tarball into nss directory. cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/%{name}-pem-20100809.tar.bz2 - + # Apply all patches %{MACRO_PATCHES} @@ -234,4 +234,8 @@ packages /usr/lib/pkgconfig end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/nss_ldap/nss_ldap.nm b/nss_ldap/nss_ldap.nm index b5293ab..d5358ca 100644 --- a/nss_ldap/nss_ldap.nm +++ b/nss_ldap/nss_ldap.nm @@ -95,4 +95,8 @@ packages /lib/security/pam_ldap.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/open-vm-tools/open-vm-tools.nm b/open-vm-tools/open-vm-tools.nm index 80e56ee..cc483b2 100644 --- a/open-vm-tools/open-vm-tools.nm +++ b/open-vm-tools/open-vm-tools.nm @@ -49,4 +49,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openjade/openjade.nm b/openjade/openjade.nm index fe2ca1a..7fe8c7f 100644 --- a/openjade/openjade.nm +++ b/openjade/openjade.nm @@ -63,7 +63,7 @@ packages prerequires +=\ docbook-dtds>=1.0-3 \ libxml2 \ - sgml-common + sgml-common script postin # Install catalog files on system. @@ -93,4 +93,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm index 38ce8ea..2400349 100644 --- a/openl2tp/openl2tp.nm +++ b/openl2tp/openl2tp.nm @@ -56,4 +56,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openldap/openldap.nm b/openldap/openldap.nm index 028ca96..fa98c0f 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -93,4 +93,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/opensp/opensp.nm b/opensp/opensp.nm index 4dabe2f..39b1592 100644 --- a/opensp/opensp.nm +++ b/opensp/opensp.nm @@ -60,4 +60,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openssh/openssh.nm b/openssh/openssh.nm index 59bdc3c..199ed10 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -96,11 +96,11 @@ packages openssh-server=%{thisver} end end - + package openssh-clients summary = OpenSSH client applications. description = %{summary} - + files /etc/ssh/ssh_config /usr/bin/scp @@ -126,14 +126,14 @@ packages /etc/ssh/ssh_config end end - + package openssh-server summary = OpenSSH server applications. description = %{summary} - + # /usr/bin/ssh-keygen is needed to generate keys for the ssh server. requires = /usr/bin/ssh-keygen - + files /etc/pam.d/sshd /etc/ssh/moduli @@ -179,4 +179,8 @@ packages /bin/systemctl daemon-reload >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index b0a6535..39b731a 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -127,4 +127,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm index e126448..3d4bbe2 100644 --- a/openvpn/openvpn.nm +++ b/openvpn/openvpn.nm @@ -57,4 +57,8 @@ packages iproute2 end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/os-prober/os-prober.nm b/os-prober/os-prober.nm index 25b013c..bef5b64 100644 --- a/os-prober/os-prober.nm +++ b/os-prober/os-prober.nm @@ -48,4 +48,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm index a805983..6280201 100644 --- a/p11-kit/p11-kit.nm +++ b/p11-kit/p11-kit.nm @@ -33,4 +33,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index bddccde..a39c505 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -98,4 +98,8 @@ packages requires = binutils file grep end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pam/pam.nm b/pam/pam.nm index 277c33e..99f8207 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -70,4 +70,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm index f7ae565..fce2197 100644 --- a/pam_ldap/pam_ldap.nm +++ b/pam_ldap/pam_ldap.nm @@ -82,4 +82,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pango/pango.nm b/pango/pango.nm index 71c99eb..b544a9a 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -40,12 +40,16 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + requires glib2-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/parted/parted.nm b/parted/parted.nm index d419fc9..dda6e61 100644 --- a/parted/parted.nm +++ b/parted/parted.nm @@ -48,8 +48,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/passwd/passwd.nm b/passwd/passwd.nm index 5d2e2eb..13061a9 100644 --- a/passwd/passwd.nm +++ b/passwd/passwd.nm @@ -43,4 +43,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/patch/patch.nm b/patch/patch.nm index 642be7d..c79094f 100644 --- a/patch/patch.nm +++ b/patch/patch.nm @@ -42,4 +42,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pax-utils/pax-utils.nm b/pax-utils/pax-utils.nm index 4f9debb..dca2b2c 100644 --- a/pax-utils/pax-utils.nm +++ b/pax-utils/pax-utils.nm @@ -31,4 +31,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/paxctl/paxctl.nm b/paxctl/paxctl.nm index ed11ec4..9783605 100644 --- a/paxctl/paxctl.nm +++ b/paxctl/paxctl.nm @@ -31,4 +31,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/paxtest/paxtest.nm b/paxtest/paxtest.nm index f99c40d..662e49b 100644 --- a/paxtest/paxtest.nm +++ b/paxtest/paxtest.nm @@ -45,4 +45,8 @@ packages shlibtest end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pcapy/pcapy.nm b/pcapy/pcapy.nm index 16b72f3..c12b51f 100644 --- a/pcapy/pcapy.nm +++ b/pcapy/pcapy.nm @@ -40,4 +40,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index 360119b..3962892 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -42,12 +42,16 @@ end packages package %{name} end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 64e4a4b..5dd980f 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -50,4 +50,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm index bc0b950..dc91a5c 100644 --- a/pdns-recursor/pdns-recursor.nm +++ b/pdns-recursor/pdns-recursor.nm @@ -97,4 +97,8 @@ packages /bin/systemctl try-restart pdns-recursor.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 39d3edc..0d0737c 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -57,4 +57,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/perl-HTML-Parser/perl-HTML-Parser.nm b/perl-HTML-Parser/perl-HTML-Parser.nm index b853fe0..dd491b6 100644 --- a/perl-HTML-Parser/perl-HTML-Parser.nm +++ b/perl-HTML-Parser/perl-HTML-Parser.nm @@ -42,4 +42,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm index 588a6d9..6a2ce7a 100644 --- a/perl-XML-Parser/perl-XML-Parser.nm +++ b/perl-XML-Parser/perl-XML-Parser.nm @@ -46,4 +46,8 @@ packages perl end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/perl/perl.nm b/perl/perl.nm index 19ff646..4ce9214 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -138,17 +138,17 @@ packages perl(:MODULE_COMPAT_5.14.2) perl(:MODULE_COMPAT_5.14.1) perl(:MODULE_COMPAT_5.14.0) - + # Threading provides perl(:WITH_ITHREADS) perl(:WITH_THREADS) - + # Largefile provides perl(:WITH_LARGEFILES) # PerlIO provides perl(:WITH_PERLIO) - + # File provides perl(abbrev.pl) perl(assert.pl) @@ -211,22 +211,22 @@ packages perl$Carp$ end end - + package perl-libs template LIBS - + provides libperl.so end - + files /usr/lib/perl5/CORE/libperl.so end end - + package perl-devel template DEVEL - + files /usr/bin/enc2xs /usr/share/man/man1/enc2xs* @@ -243,7 +243,7 @@ packages /usr/share/man/man1/perlxs* end end - + #package perl-tests # summary = Testsuite to check your Perl installation. # description-perl-tests @@ -256,12 +256,12 @@ packages # /usr/lib/perl5-tests # end #end - + package perl-Archive-Extract epoch = 0 version = 0.48 arch = noarch - + summary = Generic archive extracting mechanism. description Archive::Extract is a generic archive extraction mechanism. @@ -270,18 +270,18 @@ packages requires %{perl_requires} end - + files /usr/share/perl5/Archive/Extract.pm /usr/share/man/man3/Archive::Extract.3* end end - + package perl-Archive-Tar epoch = 0 version = 1.76 arch = noarch - + summary = A module for Perl manipulation of .tar files. description Archive::Tar provides an object oriented mechanism for handling tar files. It @@ -294,7 +294,7 @@ packages requires %{perl_requires} end - + files /usr/bin/ptar /usr/bin/ptardiff @@ -330,7 +330,7 @@ packages /usr/share/man/man3/Class::ISA.3* end end - + package perl-Compress-Raw-Zlib epoch = 0 version = 2.033 @@ -344,7 +344,7 @@ packages requires %{perl_requires} end - + files /usr/share/perl5/Compress/Raw/Zlib/ /usr/share/man/man3/Compress::Raw::Zlib* @@ -387,22 +387,22 @@ packages /usr/share/man/man3/CGI::*.3* end end - + package perl-CPAN epoch = 0 version = 1.9600.01 arch = noarch - + summary = Query, download and build perl modules from CPAN sites. description Query, download and build perl modules from CPAN sites. end - + requires %{perl_requires} perl(Digest::SHA) end - + provides cpan cpan=$(version-perl-CPAN) @@ -411,7 +411,7 @@ packages filter_requires perl$Mac::BuildTools$ end - + files /usr/bin/cpan /usr/share/perl5/CPAN* @@ -477,20 +477,20 @@ packages epoch = 0 version = 0.9103 arch = noarch - + summary = API & CLI access to the CPAN mirrors. description The CPANPLUS library is an API to the CPAN mirrors and a collection of interactive shells, commandline programs, etc, that use this API. end - + requires %{perl_requires} perl(Digest::SHA) perl(Module::Pluggable)>=2.4 perl(Module::CoreList) end - + provides perl-CPANPLUS-Dist-Build=0.06 end @@ -501,7 +501,7 @@ packages Your::Module::Here perl$DBD::SQLite$ end - + files /usr/bin/cpan2dist /usr/bin/cpanp @@ -596,11 +596,11 @@ packages /usr/share/man/man3/Digest::MD5.3* end end - + package perl-Digest-SHA epoch = 0 version = 5.61 - + summary = Perl extension for SHA-1/224/256/384/512. description Digest::SHA is a complete implementation of the NIST Secure Hash @@ -608,13 +608,13 @@ packages SHA-1, SHA-224, SHA-256, SHA-384, and SHA-512 message digests. The module can handle all types of input, including partial-byte data. end - + requires %{perl_requires} perl(Digest::base) perl(MIME::Base64) end - + files /usr/bin/shasum /usr/share/perl5/Digest/SHA* @@ -896,34 +896,34 @@ packages /usr/share/man/man3/JSON::PP::Boolean.3pm* end end - + package perl-Locale-Maketext-Simple epoch = 0 version = 0.21 arch = noarch license = MIT - + summary = Simple interface to Locale::Maketext::Lexicon. description This module is a simple wrapper around Locale::Maketext::Lexicon, designed to alleviate the need of creating Language Classes for module authors. end - + requires %{perl_requires} end - + files /usr/share/perl5/Locale/Maketext/Simple.pm /usr/share/man/man3/Locale::Maketext::Simple.* end end - + package perl-Log-Message epoch = 0 version = 0.04 arch = noarch - + summary = Generic message storage mechanism. description Log::Message is a generic message storage mechanism. It allows you to store @@ -933,11 +933,11 @@ packages identify it or group it, and a level at which to handle the message (for example, log it, or die with it). end - + requires %{perl_requires} end - + provides perl(Log::Message::Handlers)=%{version} end @@ -953,33 +953,33 @@ packages /usr/share/man/man3/Log::Message::Item.3* end end - + package perl-Log-Message-Simple epoch = 0 version = 0.08 arch = noarch - + summary = Simplified frontend to Log::Message. description This module provides standardized logging facilities using the Log::Message module. end - + requires %{perl_requires} end - + files /usr/share/perl5/Log/Message/Simple.pm /usr/share/man/man3/Log::Message::Simple.3* end end - + package perl-Module-Build epoch = 0 version = 0.3800 arch = noarch - + summary = Perl module for building and installing Perl modules. description Module::Build is a system for building, testing, and installing Perl modules. @@ -992,7 +992,7 @@ packages are included with perl 5.6.0, and it works fine on perl 5.005 if you can install a few additional modules. end - + requires %{perl_requires} perl(Archive::Tar)>=1.08 @@ -1000,7 +1000,7 @@ packages perl(ExtUtils::CBuilder)>=0.15 perl(ExtUtils::ParseXS)>=1.02 end - + files /usr/bin/config_data /usr/share/perl5/inc/ @@ -1010,23 +1010,23 @@ packages /usr/share/man/man3/inc::latest.3* end end - + package perl-Module-CoreList epoch = 0 version = 2.49_01 arch = noarch - + summary = Perl core modules indexed by perl versions. description Module::CoreList contains the hash of hashes %Module::CoreList::version, this is keyed on perl version as indicated in $]. The second level hash is module => version pairs. end - + requires %{perl_requires} end - + files /usr/bin/corelist /usr/share/perl5/Module/CoreList.pm @@ -1034,54 +1034,54 @@ packages /usr/share/man/man3/Module::CoreList* end end - + package perl-Module-Load epoch = 0 version = 0.18 arch = noarch - + summary = Runtime require of both modules and files. description Module::Load eliminates the need to know whether you are trying to require either a file or a module. end - + requires %{perl_requires} end - + files /usr/share/perl5/Module/Load.pm /usr/share/man/man3/Module::Load.* end end - + package perl-Module-Load-Conditional epoch = 0 version = 0.44 arch = noarch - + summary = Looking up module information / loading at runtime. description Module::Load::Conditional provides simple ways to query and possibly load any of the modules you have installed on your system during runtime. end - + requires %{perl_requires} end - + files /usr/share/perl5/Module/Load/ /usr/share/man/man3/Module::Load::Conditional* end end - + package perl-Module-Loaded epoch = 0 version = 0.06 arch = noarch - + summary = Mark modules as loaded or unloaded. description When testing applications, often you find yourself needing to provide @@ -1090,11 +1090,11 @@ packages modules as loaded, so they are not attempted to be loaded by perl, this module offers you a very simple way to mark modules as loaded and/or unloaded. end - + requires %{perl_requires} end - + files /usr/share/perl5/Module/Loaded.pm /usr/share/man/man3/Module::Loaded* @@ -1131,11 +1131,11 @@ packages Provides a simple but, hopefully, extensible way of having 'plugins' for your module. end - + requires %{perl_requires} end - + files /usr/share/perl5/Devel/InnerPackage.pm /usr/share/perl5/Module/Pluggable/ @@ -1149,7 +1149,7 @@ packages epoch = 0 version = 0.38 arch = noarch - + summary = Perl module that allows per object accessors. description Object::Accessor provides an interface to create per object accessors (as @@ -1159,25 +1159,25 @@ packages requires %{perl_requires} end - + files /usr/share/perl5/Object/ /usr/share/man/man3/Object::Accessor* end end - + package perl-Package-Constants epoch = 0 version = 0.02 arch = noarch - + summary = List all constants declared in a package. description Package::Constants lists all the constants defined in a certain package. This can be useful for, among others, setting up an autogenerated @EXPORT/@EXPORT_OK for a Constants.pm file. end - + requires %{perl_requires} end @@ -1187,17 +1187,17 @@ packages /usr/share/man/man3/Package::Constants* end end - + package perl-Params-Check epoch = 0 version = 0.28 arch = noarch - + summary = Generic input parsing/checking mechanism. description Params::Check is a generic input parsing/checking mechanism. end - + requires %{perl_requires} end @@ -1205,13 +1205,13 @@ packages provides perl(Params::Check) end - + files /usr/share/perl5/Params/ /usr/share/man/man3/Params::Check* end end - + package perl-Parse-CPAN-Meta epoch = 0 version = 1.4401 @@ -1222,7 +1222,7 @@ packages Parse::CPAN::Meta is a parser for META.yml files, based on the parser half of YAML::Tiny. end - + requires %{perl_requires} end @@ -1232,17 +1232,17 @@ packages /usr/share/man/man3/Parse::CPAN::Meta.3* end end - + package perl-Path-Tools epoch = 0 version = 3.33 license = (GPL+ or Artistic) and BSD - + summary = PathTools Perl module (Cwd, File::Spec). description PathTools Perl module (Cwd, File::Spec). end - + requires %{perl_requires} end @@ -1250,7 +1250,7 @@ packages filter_requires perl$VMS\:\:Filespec$ end - + files /usr/lib/perl5/Cwd.pm /usr/lib/perl5/File/Spec* @@ -1284,18 +1284,18 @@ packages /usr/share/man/man3/Perl::OSType.3pm* end end - + package perl-Pod-Escapes epoch= 0 version = 1.04 arch = noarch - + summary = Perl module for resolving POD escape sequences. description This module provides things that are useful in decoding Pod E<...> sequences. Presumably, it should be used only by Pod parsers and/or formatters. end - + requires %{perl_requires} end @@ -1303,25 +1303,25 @@ packages filter_requires %{perl_filter_requires} end - + files /usr/share/perl5/Pod/Escapes.pm /usr/share/man/man3/Pod::Escapes.* end end - + package perl-Pod-Simple epoch = 0 version = 3.16 arch = noarch - + summary = Framework for parsing POD documentation. description Pod::Simple is a Perl library for parsing text in the Pod (plain old documentation) markup language that is typically used for writing documentation for Perl and for Perl modules. end - + requires %{perl_requires} end @@ -1329,7 +1329,7 @@ packages filter_requires %{perl_filter_requires} end - + files /usr/share/perl5/Pod/Simple/ /usr/share/perl5/Pod/Simple.pm @@ -1362,7 +1362,7 @@ packages /usr/share/man/man3/Scalar::Util* end end - + package perl-Term-UI epoch = 0 version = 0.26 @@ -1654,4 +1654,8 @@ packages files end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pinentry/pinentry.nm b/pinentry/pinentry.nm index ce91c33..28353f7 100644 --- a/pinentry/pinentry.nm +++ b/pinentry/pinentry.nm @@ -37,4 +37,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pixman/pixman.nm b/pixman/pixman.nm index 850466a..fa24080 100644 --- a/pixman/pixman.nm +++ b/pixman/pixman.nm @@ -28,8 +28,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm index 25b01b3..ef0318a 100644 --- a/pkg-config/pkg-config.nm +++ b/pkg-config/pkg-config.nm @@ -40,4 +40,8 @@ packages # Say we provide an alternative spelling of the package name. provides = pkgconfig end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/polkit/polkit.nm b/polkit/polkit.nm index ac0e039..3c84681 100644 --- a/polkit/polkit.nm +++ b/polkit/polkit.nm @@ -47,8 +47,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/popt/popt.nm b/popt/popt.nm index e998cf8..9407ce2 100644 --- a/popt/popt.nm +++ b/popt/popt.nm @@ -34,8 +34,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/powertop/powertop.nm b/powertop/powertop.nm index 5ea577e..e6c250c 100644 --- a/powertop/powertop.nm +++ b/powertop/powertop.nm @@ -28,4 +28,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ppl/ppl.nm b/ppl/ppl.nm index 05a73e9..f4372b0 100644 --- a/ppl/ppl.nm +++ b/ppl/ppl.nm @@ -60,4 +60,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ppp/ppp.nm b/ppp/ppp.nm index 3e35b44..8930a92 100644 --- a/ppp/ppp.nm +++ b/ppp/ppp.nm @@ -61,8 +61,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pptp/pptp.nm b/pptp/pptp.nm index 0ce873d..8fb2822 100644 --- a/pptp/pptp.nm +++ b/pptp/pptp.nm @@ -45,4 +45,8 @@ packages iproute2 end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/procps/procps.nm b/procps/procps.nm index 5c50a59..c25c6ca 100644 --- a/procps/procps.nm +++ b/procps/procps.nm @@ -41,4 +41,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index 3601591..3e9acad 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -36,4 +36,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pth/pth.nm b/pth/pth.nm index 832d2ab..345c159 100644 --- a/pth/pth.nm +++ b/pth/pth.nm @@ -40,8 +40,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm index 513e2cb..5171e48 100644 --- a/pyQt/pyQt.nm +++ b/pyQt/pyQt.nm @@ -56,10 +56,10 @@ packages sip end end - + package %{name}-devel template DEVEL - + files /usr/bin /usr/lib/python*/site-packages/PyQt4/pyqtconfig* @@ -67,4 +67,8 @@ packages /usr/share/sip end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pyfire/pyfire.nm b/pyfire/pyfire.nm index 03b674b..7aab8b6 100644 --- a/pyfire/pyfire.nm +++ b/pyfire/pyfire.nm @@ -35,4 +35,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pygobject2/pygobject2.nm b/pygobject2/pygobject2.nm index ccdcc43..6938a56 100644 --- a/pygobject2/pygobject2.nm +++ b/pygobject2/pygobject2.nm @@ -43,24 +43,28 @@ end packages package %{name} end - + package %{name}-codegen summary = The code generation program for PyGObject. description This package contains the C code generation program for PyGObject. end - + files /usr/bin/pygobject-codegen-2.0 /usr/share/pygobject/2.0/codegen end end - + package %{name}-devel requires glib2-devel %{name}-codegen end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pyliblzma/pyliblzma.nm b/pyliblzma/pyliblzma.nm index 48450d7..a9035a5 100644 --- a/pyliblzma/pyliblzma.nm +++ b/pyliblzma/pyliblzma.nm @@ -45,4 +45,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-cairo/python-cairo.nm b/python-cairo/python-cairo.nm index 3c316c8..e1e90fc 100644 --- a/python-cairo/python-cairo.nm +++ b/python-cairo/python-cairo.nm @@ -32,11 +32,15 @@ end packages package %{name} end - + package %{name}-devel # The development headers need the cairo headers. requires cairo-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-cryptsetup/python-cryptsetup.nm b/python-cryptsetup/python-cryptsetup.nm index e35d26c..e333fe7 100644 --- a/python-cryptsetup/python-cryptsetup.nm +++ b/python-cryptsetup/python-cryptsetup.nm @@ -36,4 +36,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm index 981faba..0e2e8df 100644 --- a/python-dbus/python-dbus.nm +++ b/python-dbus/python-dbus.nm @@ -32,8 +32,12 @@ end packages package %{name} - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-gudev/python-gudev.nm b/python-gudev/python-gudev.nm index 18de1c2..eff0beb 100644 --- a/python-gudev/python-gudev.nm +++ b/python-gudev/python-gudev.nm @@ -45,4 +45,8 @@ packages pygobject2 end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-m2crypto/python-m2crypto.nm b/python-m2crypto/python-m2crypto.nm index c5a90eb..1a63217 100644 --- a/python-m2crypto/python-m2crypto.nm +++ b/python-m2crypto/python-m2crypto.nm @@ -39,4 +39,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-netfilter_conntrack/python-netfilter_conntrack.nm b/python-netfilter_conntrack/python-netfilter_conntrack.nm index f8ca758..8740400 100644 --- a/python-netfilter_conntrack/python-netfilter_conntrack.nm +++ b/python-netfilter_conntrack/python-netfilter_conntrack.nm @@ -37,4 +37,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-parted/python-parted.nm b/python-parted/python-parted.nm index a4d46d3..24f9cbf 100644 --- a/python-parted/python-parted.nm +++ b/python-parted/python-parted.nm @@ -36,4 +36,8 @@ packages python-decorator end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-piksemel/python-piksemel.nm b/python-piksemel/python-piksemel.nm index c85cf9c..366a6e3 100644 --- a/python-piksemel/python-piksemel.nm +++ b/python-piksemel/python-piksemel.nm @@ -41,4 +41,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-pyaspects/python-pyaspects.nm b/python-pyaspects/python-pyaspects.nm index f435b72..db3422c 100644 --- a/python-pyaspects/python-pyaspects.nm +++ b/python-pyaspects/python-pyaspects.nm @@ -36,4 +36,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-pyblock/python-pyblock.nm b/python-pyblock/python-pyblock.nm index de70bbb..8f19172 100644 --- a/python-pyblock/python-pyblock.nm +++ b/python-pyblock/python-pyblock.nm @@ -43,4 +43,8 @@ end packages package python-%{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-pycurl/python-pycurl.nm b/python-pycurl/python-pycurl.nm index 9d8c942..b1e600e 100644 --- a/python-pycurl/python-pycurl.nm +++ b/python-pycurl/python-pycurl.nm @@ -56,4 +56,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm index e1bd394..5c314ff 100644 --- a/python-qtermwidget/python-qtermwidget.nm +++ b/python-qtermwidget/python-qtermwidget.nm @@ -42,4 +42,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/python/python.nm b/python/python.nm index 0da3606..3458221 100644 --- a/python/python.nm +++ b/python/python.nm @@ -87,9 +87,13 @@ packages package %{name}-devel template DEVEL - + files += \ !/usr/lib/python*/config/Makefile \ !/usr/include/python*/pyconfig.h end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/pyxattr/pyxattr.nm b/pyxattr/pyxattr.nm index 8b323b8..9345fa6 100644 --- a/pyxattr/pyxattr.nm +++ b/pyxattr/pyxattr.nm @@ -37,4 +37,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/qemu/qemu.nm b/qemu/qemu.nm index 8bce043..3499c4d 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -54,4 +54,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/qt/qt.nm b/qt/qt.nm index be9f07f..b9a952f 100644 --- a/qt/qt.nm +++ b/qt/qt.nm @@ -117,10 +117,10 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + files /usr/lib/*.prl \ /usr/lib/qt4/q3porting.xml \ @@ -129,4 +129,8 @@ packages /usr/lib/qt4/mkspecs end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/qtermwidget/qtermwidget.nm b/qtermwidget/qtermwidget.nm index 05a14b3..e5cf76a 100644 --- a/qtermwidget/qtermwidget.nm +++ b/qtermwidget/qtermwidget.nm @@ -53,8 +53,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/quagga/quagga.nm b/quagga/quagga.nm index 459fc44..57dfbeb 100644 --- a/quagga/quagga.nm +++ b/quagga/quagga.nm @@ -49,4 +49,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/radvd/radvd.nm b/radvd/radvd.nm index 932c991..7c170ed 100644 --- a/radvd/radvd.nm +++ b/radvd/radvd.nm @@ -89,4 +89,8 @@ packages /bin/systemctl try-restart radvd.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/readline/readline.nm b/readline/readline.nm index 1d9095d..0c57490 100644 --- a/readline/readline.nm +++ b/readline/readline.nm @@ -55,4 +55,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/reiser4progs/reiser4progs.nm b/reiser4progs/reiser4progs.nm index 02c8968..12b3d6a 100644 --- a/reiser4progs/reiser4progs.nm +++ b/reiser4progs/reiser4progs.nm @@ -58,8 +58,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/reiserfsprogs/reiserfsprogs.nm b/reiserfsprogs/reiserfsprogs.nm index 7130e20..bd3bee0 100644 --- a/reiserfsprogs/reiserfsprogs.nm +++ b/reiserfsprogs/reiserfsprogs.nm @@ -33,4 +33,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm index 3384a59..cbfb3d4 100644 --- a/rrdtool/rrdtool.nm +++ b/rrdtool/rrdtool.nm @@ -61,12 +61,16 @@ end packages package %{name} end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/rsync/rsync.nm b/rsync/rsync.nm index 4cc20d8..3af7d69 100644 --- a/rsync/rsync.nm +++ b/rsync/rsync.nm @@ -66,4 +66,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm index dfe904b..d076187 100644 --- a/rsyslog/rsyslog.nm +++ b/rsyslog/rsyslog.nm @@ -94,4 +94,8 @@ packages /bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm index 320436c..ae55fe5 100644 --- a/rtorrent/rtorrent.nm +++ b/rtorrent/rtorrent.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/samba/samba.nm b/samba/samba.nm index e0f5537..2a5cef0 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -98,4 +98,8 @@ packages requires += %{name}-libs=%{thisver} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sane/sane.nm b/sane/sane.nm index 8d6c339..54b8d0a 100644 --- a/sane/sane.nm +++ b/sane/sane.nm @@ -45,12 +45,16 @@ end packages package %{name} end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/screen/screen.nm b/screen/screen.nm index c6d685a..e83b3fa 100644 --- a/screen/screen.nm +++ b/screen/screen.nm @@ -46,4 +46,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sdl/sdl.nm b/sdl/sdl.nm index 200dc56..5e22e05 100644 --- a/sdl/sdl.nm +++ b/sdl/sdl.nm @@ -31,8 +31,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sed/sed.nm b/sed/sed.nm index 49e71cd..5bbb61a 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -40,4 +40,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/setup/setup.nm b/setup/setup.nm index 58641f3..18d3738 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -66,4 +66,8 @@ packages /etc/shells end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sg3-utils/sg3-utils.nm b/sg3-utils/sg3-utils.nm index 3b97ee0..07ec394 100644 --- a/sg3-utils/sg3-utils.nm +++ b/sg3-utils/sg3-utils.nm @@ -26,12 +26,16 @@ sources = %{thisapp}.tgz packages package %{name} end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm index a6e6d8e..e1e3f13 100644 --- a/sgml-common/sgml-common.nm +++ b/sgml-common/sgml-common.nm @@ -44,7 +44,7 @@ build install_cmds mkdir -pv %{BUILDROOT}/etc/{sg,x}ml/docbook mkdir -pv %{BUILDROOT}/usr/share/sgml/docbook - + # Touch SGML catalog touch %{BUILDROOT}/etc/sgml/catalog diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm index e6fbf60..66cd466 100644 --- a/shadow-utils/shadow-utils.nm +++ b/shadow-utils/shadow-utils.nm @@ -79,4 +79,8 @@ packages /etc/default/useradd end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sip/sip.nm b/sip/sip.nm index 5fe790c..e6a30dc 100644 --- a/sip/sip.nm +++ b/sip/sip.nm @@ -41,12 +41,16 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + files += /usr/bin/sip - + requires = sip end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/slang/slang.nm b/slang/slang.nm index 819431e..a572e24 100644 --- a/slang/slang.nm +++ b/slang/slang.nm @@ -42,8 +42,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm index c35d048..cf16053 100644 --- a/smartmontools/smartmontools.nm +++ b/smartmontools/smartmontools.nm @@ -42,4 +42,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sqlite/sqlite.nm b/sqlite/sqlite.nm index 76d5eff..530f180 100644 --- a/sqlite/sqlite.nm +++ b/sqlite/sqlite.nm @@ -65,4 +65,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm index ac328e2..f687d85 100644 --- a/squashfs-tools/squashfs-tools.nm +++ b/squashfs-tools/squashfs-tools.nm @@ -43,4 +43,8 @@ packages package %{name} requires = libgcc_s.so.1 end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/squid/squid.nm b/squid/squid.nm index bc6e651..f41eb27 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -99,7 +99,7 @@ build echo "visible_hostname %{DISTRO_NAME}" >> %{BUILDROOT}/etc/squid/squid.conf echo "cache_effective_user squid" >> %{BUILDROOT}/etc/squid/squid.conf echo "cache_effective_group squid" >> %{BUILDROOT}/etc/squid/squid.conf - + chown -Rv squid:squid %{BUILDROOT}/var/log/squid %{BUILDROOT}/var/log/cache %{BUILDROOT}/var/cache/squid chmod 600 %{BUILDROOT}/var/cache/squid mkdir -pv %{BUILDROOT}/etc/sysconfig @@ -151,4 +151,8 @@ packages filter_requires = perl$Authen::Smb$ end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/squidGuard/squidGuard.nm b/squidGuard/squidGuard.nm index ce0e419..a45597b 100644 --- a/squidGuard/squidGuard.nm +++ b/squidGuard/squidGuard.nm @@ -53,4 +53,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/strace/strace.nm b/strace/strace.nm index 5497a55..7aec6d7 100644 --- a/strace/strace.nm +++ b/strace/strace.nm @@ -31,4 +31,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 44286b6..2db6214 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -63,4 +63,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sudo/sudo.nm b/sudo/sudo.nm index 45dfc17..92d2d1e 100644 --- a/sudo/sudo.nm +++ b/sudo/sudo.nm @@ -59,4 +59,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/suricata/suricata.nm b/suricata/suricata.nm index d1e67e2..f06c66c 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -78,8 +78,12 @@ packages end end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/swig/swig.nm b/swig/swig.nm index 2ce14b6..e3e68cc 100644 --- a/swig/swig.nm +++ b/swig/swig.nm @@ -46,4 +46,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sysfsutils/sysfsutils.nm b/sysfsutils/sysfsutils.nm index 909e005..3ace7b4 100644 --- a/sysfsutils/sysfsutils.nm +++ b/sysfsutils/sysfsutils.nm @@ -27,8 +27,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm index db8ff61..36681f7 100644 --- a/syslinux/syslinux.nm +++ b/syslinux/syslinux.nm @@ -26,7 +26,7 @@ build nasm python-devel end - + CFLAGS = -Werror -Wno-unused -finline-limit=2000 prepare_cmds @@ -63,4 +63,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 129e8ba..d8032c2 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -141,7 +141,7 @@ packages /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : end end - + # Package information for systemd-units package %{name}-units summary = Configuration files, directories and installation tool for systemd. @@ -149,7 +149,7 @@ packages This package contains all needed configuration files, directories and installation / configuration tool for systemd. end - + files /etc/systemd/system /etc/tmpfiles.d @@ -179,8 +179,12 @@ packages systemctl daemon-reload > /dev/null 2>&1 || : end end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm index 50a23e0..cdbed7f 100644 --- a/sysvinit/sysvinit.nm +++ b/sysvinit/sysvinit.nm @@ -46,4 +46,8 @@ packages package %{name} groups += Base end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/tar/tar.nm b/tar/tar.nm index 74bd88e..b4fb031 100644 --- a/tar/tar.nm +++ b/tar/tar.nm @@ -55,4 +55,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 528b3db..0ce3438 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -58,4 +58,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 849b84f..d491340 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/telnet/telnet.nm b/telnet/telnet.nm index 38da6f1..a538c7a 100644 --- a/telnet/telnet.nm +++ b/telnet/telnet.nm @@ -87,4 +87,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm index 733bc21..a59e450 100644 --- a/texinfo/texinfo.nm +++ b/texinfo/texinfo.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/tinc/tinc.nm b/tinc/tinc.nm index 6ad5618..1bf179b 100644 --- a/tinc/tinc.nm +++ b/tinc/tinc.nm @@ -35,4 +35,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/traceroute/traceroute.nm b/traceroute/traceroute.nm index 9197cb2..5d3a7f8 100644 --- a/traceroute/traceroute.nm +++ b/traceroute/traceroute.nm @@ -40,4 +40,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/transmission/transmission.nm b/transmission/transmission.nm index dbca120..7aaf8f2 100644 --- a/transmission/transmission.nm +++ b/transmission/transmission.nm @@ -32,4 +32,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/tunctl/tunctl.nm b/tunctl/tunctl.nm index 21c542c..2e51982 100644 --- a/tunctl/tunctl.nm +++ b/tunctl/tunctl.nm @@ -36,4 +36,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/u-boot/targets b/u-boot/targets new file mode 100644 index 0000000..f6fad92 --- /dev/null +++ b/u-boot/targets @@ -0,0 +1,12 @@ +# HOST_ARCH platform target +# -------------------------------------------- +armv5tel dockstar u-boot.kwb +# Dreamplug is not supported by this version of uboot. +#armv5tel dreamplug u-boot.kwb +armv5tel guruplug u-boot.kwb +armv5tel openrd_ultimate u-boot.kwb +armv5tel sheevaplug u-boot.kwb +armv7hl efikamx u-boot.imx +armv7hl igep0020 u-boot.bin +armv7hl omap3_beagle u-boot.bin +armv7hl omap4_panda u-boot.bin diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm new file mode 100644 index 0000000..0847564 --- /dev/null +++ b/u-boot/u-boot.nm @@ -0,0 +1,87 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = u-boot +version = 2011.09 +release = 1 +sup_arches = armv5tel armv7hl + +groups = Development/Tools +url = http://www.denx.de/wiki/U-Boot +license = GPLv2+ +summary = U-Boot utilities. + +description + U-Boot is a Boot Loader, i.e. its primary purpose in the shipping + system is to load some operating system. +end + +source_dl = ftp://ftp.denx.de/pub/u-boot/ +sources = %{thisapp}.tar.bz2 + +build + build + while read arch platform target; do + # Skip all other architectures. + [ "${arch}" = "%{DISTRO_ARCH}" ] || continue + + builddir="$(pwd)/build-${platform}" + mkdir -p ${builddir} + + make O=${builddir} ${platform}_config + make O=${builddir} ${builddir}/${target} + done < %{DIR_SOURCE}/targets + + # Build tools. + # Need to create a config because the tools won't build without. + make sheevaplug_config + + make tools HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" CROSS_COMPILE="" + make env HOSTCC="gcc %{CFLAGS}" HOSTSTRIP="/bin/true" + end + + install + while read arch platform target; do + # Skip all other architectures. + [ "${arch}" = "%{DISTRO_ARCH}" ] || continue + + builddir="build-${platform}" + installdir="%{BUILDROOT}/usr/lib/%{name}/${platform}" + mkdir -pv ${installdir} + + install -D -m 644 ${builddir}/${target} ${installdir} + install -D -m 644 ${builddir}/u-boot ${installdir}/uboot.elf + done < %{DIR_SOURCE}/targets + + # Install tools. + mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1 + install -p -m 0755 tools/mkimage %{BUILDROOT}/usr/bin + install -p -m 0644 doc/mkimage.1 %{BUILDROOT}/usr/share/man/man1 + install -p -m 0755 tools/env/fw_printenv %{BUILDROOT}/usr/bin + ln -svf fw_printenv %{BUILDROOT}/usr/bin/fw_setenv + end +end + +packages + package %{name} + + package %{name}-tools + summary = U-Boot utilities. + description + This package contains a few U-Boot utilities - mkimage + for creating boot images and fw_printenv/fw_setenv for + manipulating the boot environment variables. + end + + files + /usr/bin + /usr/share/man/man1 + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/udev/udev.nm b/udev/udev.nm index f7375ab..1629b1c 100644 --- a/udev/udev.nm +++ b/udev/udev.nm @@ -72,4 +72,8 @@ packages package lib%{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/udisks/udisks.nm b/udisks/udisks.nm index 188edc5..b6288f3 100644 --- a/udisks/udisks.nm +++ b/udisks/udisks.nm @@ -53,4 +53,8 @@ packages xfsprogs end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm index c383406..fd1a789 100644 --- a/ulogd2/ulogd2.nm +++ b/ulogd2/ulogd2.nm @@ -48,4 +48,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/unzip/unzip.nm b/unzip/unzip.nm index a385946..9a1ab51 100644 --- a/unzip/unzip.nm +++ b/unzip/unzip.nm @@ -52,4 +52,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/upower/upower.nm b/upower/upower.nm index a3fdc08..67949dd 100644 --- a/upower/upower.nm +++ b/upower/upower.nm @@ -41,12 +41,16 @@ packages package %{name} requires = udev util-linux end - + package %{name}-libs template LIBS end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/usb-modeswitch/usb-modeswitch.nm b/usb-modeswitch/usb-modeswitch.nm index dc659ba..2e8ebad 100644 --- a/usb-modeswitch/usb-modeswitch.nm +++ b/usb-modeswitch/usb-modeswitch.nm @@ -30,4 +30,8 @@ packages package %{name} requires += usb-modeswitch-data end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm index 7319cae..6a24f09 100644 --- a/usbutils/usbutils.nm +++ b/usbutils/usbutils.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/ustr/ustr.nm b/ustr/ustr.nm index bbf76ca..a8e8eb9 100644 --- a/ustr/ustr.nm +++ b/ustr/ustr.nm @@ -39,10 +39,10 @@ end packages package %{name} end - + package %{name}-devel template DEVEL - + files /usr/bin/ /usr/include/ @@ -50,4 +50,8 @@ packages */lib/*.so end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 7c1c558..351c794 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -124,7 +124,7 @@ packages This is the block device identification library, part of util-linux. end - + files /lib/libblkid.* end @@ -134,7 +134,7 @@ packages package libblkid-devel summary = Development library and header of libblkid. description = %{summary} - + files /usr/include/blkid/ /usr/lib/libblkid.* @@ -150,7 +150,7 @@ packages This is the universally unique ID library, part of util-linux. end - + files /lib/libuuid.* end @@ -160,7 +160,7 @@ packages package libuuid-devel summary = Development library and header of libuuid. description = %{summary} - + files /usr/include/uuid/ /usr/lib/libuuid.* @@ -176,7 +176,7 @@ packages This is the device mounting library, part of util-linux. end - + files /lib/libmount.* end @@ -186,7 +186,7 @@ packages package libmount-devel summary = Development library and header of libmount. description = %{summary} - + files /usr/include/mount/ /usr/lib/libmount.* @@ -194,4 +194,8 @@ packages /usr/share/man/man3/*mount* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/vala/vala.nm b/vala/vala.nm index 84b2f02..015c06a 100644 --- a/vala/vala.nm +++ b/vala/vala.nm @@ -42,8 +42,12 @@ packages package %{name} requires = glib2 end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/vim/vim.nm b/vim/vim.nm index 20ba026..5ce9fd8 100644 --- a/vim/vim.nm +++ b/vim/vim.nm @@ -53,4 +53,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/vlan/vlan.nm b/vlan/vlan.nm index 18f4d7c..c9ddf10 100644 --- a/vlan/vlan.nm +++ b/vlan/vlan.nm @@ -38,4 +38,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/vsftpd/vsftpd.nm b/vsftpd/vsftpd.nm index f34c677..8eb1f4c 100644 --- a/vsftpd/vsftpd.nm +++ b/vsftpd/vsftpd.nm @@ -53,4 +53,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/wavemon/wavemon.nm b/wavemon/wavemon.nm index e86f903..ea4f1a0 100644 --- a/wavemon/wavemon.nm +++ b/wavemon/wavemon.nm @@ -36,4 +36,8 @@ packages package %{name} requires = wireless-tools end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/wget/wget.nm b/wget/wget.nm index 29d21c9..7803a2c 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -38,4 +38,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/which/which.nm b/which/which.nm index aab6f00..5457912 100644 --- a/which/which.nm +++ b/which/which.nm @@ -21,4 +21,8 @@ source_dl = http://carlo17.home.xs4all.nl/which/ packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm index c7faada..44a5f73 100644 --- a/wireless-tools/wireless-tools.nm +++ b/wireless-tools/wireless-tools.nm @@ -45,8 +45,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm index 05730fd..fb0af1a 100644 --- a/wpa_supplicant/wpa_supplicant.nm +++ b/wpa_supplicant/wpa_supplicant.nm @@ -54,4 +54,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xcb-util/xcb-util.nm b/xcb-util/xcb-util.nm index 4d7b580..ebeb037 100644 --- a/xcb-util/xcb-util.nm +++ b/xcb-util/xcb-util.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xen/xen.nm b/xen/xen.nm index f0a8e39..ab41445 100644 --- a/xen/xen.nm +++ b/xen/xen.nm @@ -110,4 +110,8 @@ packages develop applications which manage Xen virtual machines. end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm index 24dfbc0..51e2d73 100644 --- a/xfsprogs/xfsprogs.nm +++ b/xfsprogs/xfsprogs.nm @@ -63,8 +63,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm index b0cf500..3ca1240 100644 --- a/xmlto/xmlto.nm +++ b/xmlto/xmlto.nm @@ -43,4 +43,8 @@ packages util-linux end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm index ce5358a..2a76462 100644 --- a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm +++ b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm @@ -48,4 +48,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm index b85e242..56b0c56 100644 --- a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm +++ b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm @@ -48,4 +48,8 @@ packages package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm index c72bddc..9c2ae1d 100644 --- a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm +++ b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm @@ -63,4 +63,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm index 03f6f9a..bcaa6a7 100644 --- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm +++ b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm @@ -42,4 +42,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm index 8badb77..5289c41 100644 --- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm +++ b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm @@ -43,4 +43,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm index 91fd257..af61d9e 100644 --- a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm +++ b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm @@ -52,4 +52,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm index e3d57f0..87d378f 100644 --- a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm +++ b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm @@ -53,8 +53,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm index 66fc404..eee113a 100644 --- a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm +++ b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm @@ -47,4 +47,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm index a24655f..15d6eaa 100644 --- a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm +++ b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm @@ -47,4 +47,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm index 8bf368f..b849bd4 100644 --- a/xorg-x11-font-utils/xorg-x11-font-utils.nm +++ b/xorg-x11-font-utils/xorg-x11-font-utils.nm @@ -36,7 +36,7 @@ build libfontenc-devel pkg-config xorg-x11-proto-devel - zlib-devel + zlib-devel end configure_options += \ @@ -84,4 +84,8 @@ packages freetype-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm index 5744b31..856df62 100644 --- a/xorg-x11-fonts/xorg-x11-fonts.nm +++ b/xorg-x11-fonts/xorg-x11-fonts.nm @@ -115,7 +115,7 @@ build cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \ %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz - # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. + # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. # Install catalogue symlinks #mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d #ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi @@ -395,9 +395,9 @@ packages description GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP). end - + files - /usr/share/X11/fonts/misc/unifont.pcf.gz + /usr/share/X11/fonts/misc/unifont.pcf.gz end end end diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm index 5897513..7ed9a8b 100644 --- a/xorg-x11-server/xorg-x11-server.nm +++ b/xorg-x11-server/xorg-x11-server.nm @@ -146,13 +146,17 @@ packages xorg-x11-xkb-utils end end - + package %{name}-devel template DEVEL - + requires libpciaccess-devel pixman-devel end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm index b73bd2d..cd82436 100644 --- a/xorg-x11-xinit/xorg-x11-xinit.nm +++ b/xorg-x11-xinit/xorg-x11-xinit.nm @@ -29,4 +29,8 @@ end packages package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm index 25abfb7..c7d194e 100644 --- a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm +++ b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm @@ -65,4 +65,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xrandr/xrandr.nm b/xrandr/xrandr.nm index 1ce8c6a..eebec73 100644 --- a/xrandr/xrandr.nm +++ b/xrandr/xrandr.nm @@ -37,4 +37,8 @@ end packages package %{name} end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xterm/xterm.nm b/xterm/xterm.nm index 7ed6708..52b824a 100644 --- a/xterm/xterm.nm +++ b/xterm/xterm.nm @@ -48,4 +48,8 @@ packages package %{name} requires = xorg-x11-server end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/xz/xz.nm b/xz/xz.nm index 3150feb..75711a0 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -84,4 +84,8 @@ packages /usr/lib/lib*.so.0* end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/zerofree/zerofree.nm b/zerofree/zerofree.nm index dc21ca8..5820fae 100644 --- a/zerofree/zerofree.nm +++ b/zerofree/zerofree.nm @@ -47,4 +47,8 @@ end packages package zerofree end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/zlib/zlib.nm b/zlib/zlib.nm index a1bafc2..d65d2f8 100644 --- a/zlib/zlib.nm +++ b/zlib/zlib.nm @@ -44,8 +44,12 @@ end packages package %{name} end - + package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. aa1df42da2262e93c29a28c53d0e2ed1c03d634b
by git＠ipfire.org 11 Dec '11

11 Dec '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2011