IPFire-SCM December 2012

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c313dec7d860d47b51c69923a3d91c8f2334df5
by git＠ipfire.org 30 Dec '12

30 Dec '12

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 5c313dec7d860d47b51c69923a3d91c8f2334df5 (commit) from 65c6ed3f278cc8e42dc79309bed1c96e8c171d33 (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 5c313dec7d860d47b51c69923a3d91c8f2334df5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 30 09:48:35 2012 +0100 lcr: fix logfile in initskript. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/lcr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/lcr b/src/initscripts/init.d/lcr index 56a4553..dd72967 100644 --- a/src/initscripts/init.d/lcr +++ b/src/initscripts/init.d/lcr @@ -18,7 +18,7 @@ case "${1}" in start) boot_mesg "Starting Linux Call Router..." - nice --10 /usr/sbin/lcr fork >> /var/log/lcr 2>&1 + nice --10 /usr/sbin/lcr fork >> /var/log/lcr/console.log 2>&1 evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65c6ed3f278cc8e42dc79309bed1c96e8c171d33
by git＠ipfire.org 30 Dec '12

30 Dec '12

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 65c6ed3f278cc8e42dc79309bed1c96e8c171d33 (commit) via 568854621c0c8182da236227106c96d43478fea4 (commit) via 00ede2200eae242c6f91f876a05d6dca57fbfba3 (commit) from d77b8843c75abb260be7f6952671445151dd3d76 (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 65c6ed3f278cc8e42dc79309bed1c96e8c171d33 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 30 09:43:45 2012 +0100 transmission: update to 2.75. commit 568854621c0c8182da236227106c96d43478fea4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 22:48:31 2012 +0100 initskripts: fix leds userskript start. commit 00ede2200eae242c6f91f876a05d6dca57fbfba3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 22:42:47 2012 +0100 transmission: run as nobody. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/transmission | 74 +++++++++++++++++++++------------- lfs/transmission | 6 +-- src/initscripts/init.d/leds | 4 +- src/initscripts/init.d/transmission | 6 ++- 4 files changed, 56 insertions(+), 34 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission index af8a68a..3321b71 100644 --- a/config/rootfiles/packages/transmission +++ b/config/rootfiles/packages/transmission @@ -16,31 +16,8 @@ usr/share/transmission #usr/share/transmission/web #usr/share/transmission/web/LICENSE #usr/share/transmission/web/images -#usr/share/transmission/web/images/buttons -#usr/share/transmission/web/images/buttons/cancel.png -#usr/share/transmission/web/images/buttons/file_priority_buttons.png -#usr/share/transmission/web/images/buttons/file_wanted_buttons.png -#usr/share/transmission/web/images/buttons/info_activity.png -#usr/share/transmission/web/images/buttons/info_files.png -#usr/share/transmission/web/images/buttons/info_general.png -#usr/share/transmission/web/images/buttons/info_peers.png -#usr/share/transmission/web/images/buttons/info_trackers.png -#usr/share/transmission/web/images/buttons/tab_backgrounds.png -#usr/share/transmission/web/images/buttons/tab_backgrounds_highlight.png -#usr/share/transmission/web/images/buttons/toolbar_buttons.png -#usr/share/transmission/web/images/buttons/torrent_buttons.png #usr/share/transmission/web/images/favicon.ico #usr/share/transmission/web/images/favicon.png -#usr/share/transmission/web/images/graphics -#usr/share/transmission/web/images/graphics/blue-turtle.png -#usr/share/transmission/web/images/graphics/chrome.png -#usr/share/transmission/web/images/graphics/filter_bar.png -#usr/share/transmission/web/images/graphics/filter_icon.png -#usr/share/transmission/web/images/graphics/iphone_chrome.png -#usr/share/transmission/web/images/graphics/lock_icon.png -#usr/share/transmission/web/images/graphics/logo.png -#usr/share/transmission/web/images/progress -#usr/share/transmission/web/images/progress/progress.png #usr/share/transmission/web/images/webclip-icon.png #usr/share/transmission/web/index.html #usr/share/transmission/web/javascript @@ -53,17 +30,58 @@ usr/share/transmission #usr/share/transmission/web/javascript/jquery/jquery.contextmenu.min.js #usr/share/transmission/web/javascript/jquery/jquery.form.js #usr/share/transmission/web/javascript/jquery/jquery.form.min.js +#usr/share/transmission/web/javascript/jquery/jquery.min.js #usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js +#usr/share/transmission/web/javascript/jquery/jqueryui-1.8.16.min.js #usr/share/transmission/web/javascript/jquery/json2.min.js +#usr/share/transmission/web/javascript/notifications.js #usr/share/transmission/web/javascript/prefs-dialog.js #usr/share/transmission/web/javascript/remote.js #usr/share/transmission/web/javascript/torrent-row.js #usr/share/transmission/web/javascript/torrent.js #usr/share/transmission/web/javascript/transmission.js -#usr/share/transmission/web/stylesheets -#usr/share/transmission/web/stylesheets/common.css -#usr/share/transmission/web/stylesheets/ie7.css -#usr/share/transmission/web/stylesheets/ieAll.css -#usr/share/transmission/web/stylesheets/mobile.css +#usr/share/transmission/web/style +#usr/share/transmission/web/style/jqueryui +#usr/share/transmission/web/style/jqueryui/images +#usr/share/transmission/web/style/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png +#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png +#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_dadada_1x400.png +#usr/share/transmission/web/style/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png +#usr/share/transmission/web/style/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png +#usr/share/transmission/web/style/jqueryui/images/ui-icons_222222_256x240.png +#usr/share/transmission/web/style/jqueryui/images/ui-icons_454545_256x240.png +#usr/share/transmission/web/style/jqueryui/jqueryui-1.8.16.css +#usr/share/transmission/web/style/transmission +#usr/share/transmission/web/style/transmission/common.css +#usr/share/transmission/web/style/transmission/images +#usr/share/transmission/web/style/transmission/images/arrow-down.png +#usr/share/transmission/web/style/transmission/images/arrow-up.png +#usr/share/transmission/web/style/transmission/images/blue-turtle.png +#usr/share/transmission/web/style/transmission/images/buttons +#usr/share/transmission/web/style/transmission/images/buttons/torrent_buttons.png +#usr/share/transmission/web/style/transmission/images/compact.png +#usr/share/transmission/web/style/transmission/images/file-priority-high.png +#usr/share/transmission/web/style/transmission/images/file-priority-low.png +#usr/share/transmission/web/style/transmission/images/file-priority-normal.png +#usr/share/transmission/web/style/transmission/images/filter_bar.png +#usr/share/transmission/web/style/transmission/images/filter_icon.png +#usr/share/transmission/web/style/transmission/images/inspector-files.png +#usr/share/transmission/web/style/transmission/images/inspector-info.png +#usr/share/transmission/web/style/transmission/images/inspector-peers.png +#usr/share/transmission/web/style/transmission/images/inspector-trackers.png +#usr/share/transmission/web/style/transmission/images/lock_icon.png +#usr/share/transmission/web/style/transmission/images/logo.png +#usr/share/transmission/web/style/transmission/images/progress.png +#usr/share/transmission/web/style/transmission/images/settings.png +#usr/share/transmission/web/style/transmission/images/toolbar-close.png +#usr/share/transmission/web/style/transmission/images/toolbar-folder.png +#usr/share/transmission/web/style/transmission/images/toolbar-info.png +#usr/share/transmission/web/style/transmission/images/toolbar-pause-all.png +#usr/share/transmission/web/style/transmission/images/toolbar-pause.png +#usr/share/transmission/web/style/transmission/images/toolbar-start-all.png +#usr/share/transmission/web/style/transmission/images/toolbar-start.png +#usr/share/transmission/web/style/transmission/images/turtle.png +#usr/share/transmission/web/style/transmission/images/wrench.png +#usr/share/transmission/web/style/transmission/mobile.css var/ipfire/backup/addons/includes/transmission etc/rc.d/init.d/transmission diff --git a/lfs/transmission b/lfs/transmission index 6e2ab79..340cf00 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,7 +24,7 @@ include Config -VER = 2.42 +VER = 2.75 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 3 +PAK_VER = 4 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 50f6dd76c5c01f45d5ed20783c686815 +$(DL_FILE)_MD5 = 26b92e56e1574bb10443eccbf17443a7 install : $(TARGET) diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds index 8183829..0d6ee72 100644 --- a/src/initscripts/init.d/leds +++ b/src/initscripts/init.d/leds @@ -9,8 +9,8 @@ . /etc/sysconfig/rc . ${rc_functions} -if [ -e $0.user ]; then - $0.user $* +if [ -e /etc/init.d/leds.user ]; then + /etc/init.d/leds.user $* exit ${?} fi diff --git a/src/initscripts/init.d/transmission b/src/initscripts/init.d/transmission index 2ad7d48..6fd7cd5 100644 --- a/src/initscripts/init.d/transmission +++ b/src/initscripts/init.d/transmission @@ -18,12 +18,16 @@ case "${1}" in start) boot_mesg "Starting transmission daemon..." - transmission-daemon -g /etc/transmission + chown -R nobody /etc/transmission + chown -R nobody /var/transmission + sudo -u nobody transmission-daemon -g /etc/transmission + evaluate_retval ;; stop) boot_mesg "Stopping transmission daemon..." killall transmission-daemon + evaluate_retval ;; restart) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d77b8843c75abb260be7f6952671445151dd3d76
by git＠ipfire.org 29 Dec '12

29 Dec '12

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 d77b8843c75abb260be7f6952671445151dd3d76 (commit) via 52b597b40cdaab9f4adaeb9d5a938a4c670f76d1 (commit) via 07c9b89f861e4fc08b8d8bea2207064a235641aa (commit) via c3d9a16d5768bb4dbcdd731674c4bc48efab48e3 (commit) from d81d4fa89c2e2e83100d1553191b3a22416957e7 (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 d77b8843c75abb260be7f6952671445151dd3d76 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 18:17:10 2012 +0100 wpa_supplicant: update to 1.1. commit 52b597b40cdaab9f4adaeb9d5a938a4c670f76d1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 18:16:44 2012 +0100 hostapd: update to 1.1. commit 07c9b89f861e4fc08b8d8bea2207064a235641aa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 16:30:07 2012 +0100 modprobe.d condig: remove REGDOMAIN setting comment. If the regdomain was set here it cannot changed later with iw reg set. commit c3d9a16d5768bb4dbcdd731674c4bc48efab48e3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Dec 29 16:20:16 2012 +0100 hostapd: add country selection and fix txpower display. ----------------------------------------------------------------------- Summary of changes: config/etc/modprobe.d/cfg80211 | 1 - config/rootfiles/core/66/filelists/files | 1 + html/cgi-bin/wlanap.cgi | 39 +++++++++++++++++++++++++++++--- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/hostapd | 6 ++--- lfs/wpa_supplicant | 4 ++-- src/initscripts/init.d/hostapd | 5 ++++ 8 files changed, 49 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211 index 9e04ea6..e72bedd 100644 --- a/config/etc/modprobe.d/cfg80211 +++ b/config/etc/modprobe.d/cfg80211 @@ -1,2 +1 @@ -#options cfg80211 ieee80211_regdom=DE blacklist ieee80211 diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index 3f9acf5..bf51301 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -1,5 +1,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/issue +etc/modprobe.d/cfg80211 etc/rc.d/init.d/firewall etc/rc.d/init.d/fsresize etc/rc.d/init.d/halt diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 99c77e3..83d65db 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -49,6 +49,7 @@ my %mainsettings = (); my %netsettings=(); my %wlanapsettings=(); my $channel = ''; +my $country = ''; my $txpower = ''; &General::readhash("${General::swroot}/main/settings", \%mainsettings); @@ -64,6 +65,7 @@ $wlanapsettings{'HIDESSID'} = 'off'; $wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2 $wlanapsettings{'TXPOWER'} = 'auto'; $wlanapsettings{'CHANNEL'} = '05'; +$wlanapsettings{'COUNTRY'} = '00'; $wlanapsettings{'HW_MODE'} = 'g'; $wlanapsettings{'PWD'} = 'IPFire-2.x'; $wlanapsettings{'SYSLOGLEVEL'} = '0'; @@ -243,11 +245,17 @@ $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'"; $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; +$selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'"; $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'"; $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'"; -my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`; +my $monwlaninterface = $wlanapsettings{'INTERFACE'}; +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ + $monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'}; +} + +my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`; # get available channels my @temp; @@ -258,8 +266,23 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);} } my @channellist = @temp; -my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`; -# get available channels +my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; +# get available country codes + +my @temp; +foreach (@countrylist_cmd){ +$_ =~ /country (.*):/; +$country = $1;chomp $country; +if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);} +} +my @countrylist = @temp; + +my @txpower_cmd = `iwlist $monwlaninterface txpower 2>/dev/null`; +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ + # There is a bug with NL80211 only all devices can displayed + @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`; +} +# get available power my @temp; foreach (@txpower_cmd){ @@ -378,6 +401,16 @@ foreach $channel (@channellist){ print <<END </select></td></tr> +<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'> + <select name='COUNTRY'> +END +; +foreach $country (@countrylist){ + print "<option $selected{'COUNTRY'}{$country}>$country</option>"; +} + +print <<END +</select></td></tr> <tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'> END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 05e1d85..ca5dbb3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2201,6 +2201,7 @@ 'wireless config changed' => 'Wireless Konfiguration geändert', 'wireless configuration' => 'Wireless-Konfiguration', 'wlanap access point' => 'Access Point', +'wlanap country' => 'Ländercode', 'wlanap channel' => 'Kanal', 'wlanap debugging' => 'Debugging', 'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f0fa2c2..ede4517 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2234,6 +2234,7 @@ 'wireless config changed' => 'Wireless config changed', 'wireless configuration' => 'Wireless Configuration', 'wlanap access point' => 'Access Point', +'wlanap country' => 'Country Code', 'wlanap channel' => 'Channel', 'wlanap debugging' => 'Debugging', 'wlanap del interface' => 'Remove selected interface?', diff --git a/lfs/hostapd b/lfs/hostapd index 01768b8..f29712a 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@ include Config -VER = 1.0 +VER = 1.1 THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 22 +PAK_VER = 23 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 236247a7bbd4f60d5fa3e99849d1ffc9 +$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7 install : $(TARGET) diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index ef539df..e8a67e0 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -24,7 +24,7 @@ include Config -VER = 1.0 +VER = 1.1 THISAPP = wpa_supplicant-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8650f6aa23646ef634402552d0669640 +$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c install : $(TARGET) diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd index 3108339..c0b11e6 100644 --- a/src/initscripts/init.d/hostapd +++ b/src/initscripts/init.d/hostapd @@ -3,6 +3,7 @@ . ${rc_functions} CHANNEL="05" +COUNTRY="00" TXPOWER="auto" INTERFACE="blue0" MACMODE="0" @@ -74,6 +75,10 @@ case "${1}" in fi fi + # First reset to World (00) and then set new country + /usr/sbin/iw reg set 00 + /usr/sbin/iw reg set $COUNTRY + /usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4776125b98c8ed617a4eb7491739a2290a2d5268
by git＠ipfire.org 27 Dec '12

27 Dec '12

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 4776125b98c8ed617a4eb7491739a2290a2d5268 (commit) via d1ecc343927899c30c0e7930cd9178207c30a977 (commit) from 86e241bd3f6e12300ca084399a7ec084e736d301 (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 4776125b98c8ed617a4eb7491739a2290a2d5268 Merge: d1ecc34 86e241b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 28 00:49:15 2012 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit d1ecc343927899c30c0e7930cd9178207c30a977 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Dec 28 00:48:49 2012 +0100 libunwind: New package. An unwinding library. ----------------------------------------------------------------------- Summary of changes: libunwind/libunwind.nm | 62 ++++++++ .../patches/libunwind-arm-register-rename.patch | 59 +++++++ libunwind/patches/libunwind-disable-setjmp.patch | 170 +++++++++++++++++++++ 3 files changed, 291 insertions(+) create mode 100644 libunwind/libunwind.nm create mode 100644 libunwind/patches/libunwind-arm-register-rename.patch create mode 100644 libunwind/patches/libunwind-disable-setjmp.patch Difference in files: diff --git a/libunwind/libunwind.nm b/libunwind/libunwind.nm new file mode 100644 index 0000000..eb8dbc6 --- /dev/null +++ b/libunwind/libunwind.nm @@ -0,0 +1,62 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libunwind +version = 1.0.1 +release = 1 + +groups = Development/Debuggers +url = http://savannah.nongnu.org/projects/libunwind +license = BSD +summary = An unwinding library. + +description + Libunwind provides a C ABI to determine the call-chain of a program. +end + +source_dl = http://download.savannah.gnu.org/releases/libunwind/ + +build + requires + autoconf + automake + libtool + end + + prepare_cmds + aclocal + libtoolize --force + autoheader + automake --add-missing + autoconf + end + + configure_options += \ + --enable-static \ + --enable-shared + + keep_libraries = %{libdir}/libunwind-ptrace.a + + # Does not work very well. + #test + # make check + #end + + install_cmds + rm -vf %{BUILDROOT}%{libdir}/libunwind-ptrace.so* + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libunwind/patches/libunwind-arm-register-rename.patch b/libunwind/patches/libunwind-arm-register-rename.patch new file mode 100644 index 0000000..9d7b91c --- /dev/null +++ b/libunwind/patches/libunwind-arm-register-rename.patch @@ -0,0 +1,59 @@ +--- libunwind-1.0.1/src/arm/init.h.orig 2012-02-15 18:33:08.000000000 -0500 ++++ libunwind-1.0.1/src/arm/init.h 2012-02-15 18:29:19.000000000 -0500 +@@ -29,26 +29,26 @@ + { + int ret, i; + +- c->dwarf.loc[R0] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R0); +- c->dwarf.loc[R1] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R1); +- c->dwarf.loc[R2] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R2); +- c->dwarf.loc[R3] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R3); +- c->dwarf.loc[R4] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R4); +- c->dwarf.loc[R5] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R5); +- c->dwarf.loc[R6] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R6); +- c->dwarf.loc[R7] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R7); +- c->dwarf.loc[R8] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R8); +- c->dwarf.loc[R9] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R9); +- c->dwarf.loc[R10] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R10); +- c->dwarf.loc[R11] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R11); +- c->dwarf.loc[R12] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R12); +- c->dwarf.loc[R13] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R13); +- c->dwarf.loc[R14] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R14); +- c->dwarf.loc[R15] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R15); +- for (i = R15 + 1; i < DWARF_NUM_PRESERVED_REGS; ++i) ++ c->dwarf.loc[REG_R0] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R0); ++ c->dwarf.loc[REG_R1] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R1); ++ c->dwarf.loc[REG_R2] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R2); ++ c->dwarf.loc[REG_R3] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R3); ++ c->dwarf.loc[REG_R4] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R4); ++ c->dwarf.loc[REG_R5] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R5); ++ c->dwarf.loc[REG_R6] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R6); ++ c->dwarf.loc[REG_R7] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R7); ++ c->dwarf.loc[REG_R8] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R8); ++ c->dwarf.loc[REG_R9] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R9); ++ c->dwarf.loc[REG_R10] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R10); ++ c->dwarf.loc[REG_R11] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R11); ++ c->dwarf.loc[REG_R12] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R12); ++ c->dwarf.loc[REG_R13] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R13); ++ c->dwarf.loc[REG_R14] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R14); ++ c->dwarf.loc[REG_R15] = DWARF_REG_LOC (&c->dwarf, UNW_ARM_R15); ++ for (i = REG_R15 + 1; i < DWARF_NUM_PRESERVED_REGS; ++i) + c->dwarf.loc[i] = DWARF_NULL_LOC; + +- ret = dwarf_get (&c->dwarf, c->dwarf.loc[R15], &c->dwarf.ip); ++ ret = dwarf_get (&c->dwarf, c->dwarf.loc[REG_R15], &c->dwarf.ip); + if (ret < 0) + return ret; + +--- libunwind-1.0.1/src/arm/Gglobal.c.orig 2012-02-15 18:33:21.000000000 -0500 ++++ libunwind-1.0.1/src/arm/Gglobal.c 2012-02-15 18:28:27.000000000 -0500 +@@ -37,7 +37,8 @@ + + HIDDEN uint8_t dwarf_to_unw_regnum_map[16] = + { +- R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15 ++ REG_R0, REG_R1, REG_R2, REG_R3, REG_R4, REG_R5, REG_R6, REG_R7, ++ REG_R8, REG_R9, REG_R10, REG_R11, REG_R12, REG_R13, REG_R14, REG_R15 + }; + + HIDDEN void diff --git a/libunwind/patches/libunwind-disable-setjmp.patch b/libunwind/patches/libunwind-disable-setjmp.patch new file mode 100644 index 0000000..ef68f64 --- /dev/null +++ b/libunwind/patches/libunwind-disable-setjmp.patch @@ -0,0 +1,170 @@ +At least x86_64 version cannot work, src/setjmp/setjmp.c and +src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not +match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h . + +google-perftools link only with libunwind.so.7 . + +--- libunwind-1.0.1-orig/src/Makefile.am 2011-09-11 05:06:41.000000000 +0200 ++++ libunwind-1.0.1/src/Makefile.am 2011-09-15 13:55:42.000000000 +0200 +@@ -1,5 +1,5 @@ + SOVERSION=8:0:0 # See comments at end of file. +-SETJMP_SO_VERSION=0:0:0 ++#SETJMP_SO_VERSION=0:0:0 + # + # Don't link with start-files since we don't use any constructors/destructors: + # +@@ -27,8 +27,8 @@ libunwind_ptrace_a_SOURCES = \ + noinst_HEADERS += ptrace/_UPT_internal.h + + ### libunwind-setjmp: +-libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \ +- -version-info $(SETJMP_SO_VERSION) ++#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \ ++# -version-info $(SETJMP_SO_VERSION) + + if USE_ELF32 + LIBUNWIND_ELF = libunwind-elf32.la +@@ -40,12 +40,12 @@ if USE_ELFXX + LIBUNWIND_ELF = libunwind-elfxx.la + endif + +-libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \ +- libunwind-$(arch).la \ +- libunwind.la -lc +-libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \ +- setjmp/siglongjmp.c +-noinst_HEADERS += setjmp/setjmp_i.h ++#libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \ ++# libunwind-$(arch).la \ ++# libunwind.la -lc ++#libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \ ++# setjmp/siglongjmp.c ++#noinst_HEADERS += setjmp/setjmp_i.h + + ### libunwind: + libunwind_la_LIBADD = +@@ -373,7 +373,7 @@ if ARCH_ARM + if !REMOTE_ONLY + libunwind_arm_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += arm/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S + else + if ARCH_IA64 + ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c +@@ -393,8 +393,8 @@ Lcursor_i.h: ia64/mk_Lcursor_i + if !REMOTE_ONLY + libunwind_ia64_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \ +- ia64/longjmp.S ia64/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \ ++# ia64/longjmp.S ia64/siglongjmp.S + else + if ARCH_HPPA + lib_LTLIBRARIES += libunwind-hppa.la +@@ -406,7 +406,7 @@ if ARCH_HPPA + if !REMOTE_ONLY + libunwind_hppa_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S + else + if ARCH_MIPS + lib_LTLIBRARIES += libunwind-mips.la +@@ -418,7 +418,7 @@ if ARCH_MIPS + if !REMOTE_ONLY + libunwind_mips_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += mips/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += mips/siglongjmp.S + else + if ARCH_X86 + lib_LTLIBRARIES += libunwind-x86.la +@@ -430,7 +430,7 @@ if ARCH_X86 + if !REMOTE_ONLY + libunwind_x86_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S + else + if ARCH_X86_64 + lib_LTLIBRARIES += libunwind-x86_64.la +@@ -442,7 +442,7 @@ if ARCH_X86_64 + if !REMOTE_ONLY + libunwind_x86_64_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S + else + if ARCH_PPC32 + lib_LTLIBRARIES += libunwind-ppc32.la +@@ -454,7 +454,7 @@ if ARCH_PPC32 + if !REMOTE_ONLY + libunwind_ppc32_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S + else + if ARCH_PPC64 + lib_LTLIBRARIES += libunwind-ppc64.la +@@ -466,7 +466,7 @@ if ARCH_PPC64 + if !REMOTE_ONLY + libunwind_ppc64_la_LIBADD += libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S ++# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S + + endif # ARCH_PPC64 + endif # ARCH_PPC32 +@@ -480,7 +480,7 @@ endif # ARCH_ARM + # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added + # at the end. + if !REMOTE_ONLY +-lib_LTLIBRARIES += libunwind-setjmp.la ++#lib_LTLIBRARIES += libunwind-setjmp.la + endif + + # +--- libunwind-1.0.1-orig/tests/Makefile.am 2011-09-11 05:06:41.000000000 +0200 ++++ libunwind-1.0.1/tests/Makefile.am 2011-09-15 13:56:16.000000000 +0200 +@@ -27,7 +27,7 @@ if ARCH_IA64 + Gia64-test-nat Lia64-test-nat \ + Gia64-test-rbs Lia64-test-rbs \ + Gia64-test-readonly Lia64-test-readonly \ +- ia64-test-setjmp ia64-test-sig ++ ia64-test-sig + else + if ARCH_PPC64 + if USE_ALTIVEC +@@ -44,8 +44,9 @@ endif #ARCH_IA64 + Gtest-dyn1 Ltest-dyn1 \ + Gtest-trace Ltest-trace \ + test-async-sig test-flush-cache test-init-remote \ +- test-mem test-setjmp test-ptrace \ ++ test-mem test-ptrace \ + Ltest-nomalloc Ltest-nocalloc rs-race ++# test-setjmp + noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc \ + Gperf-simple Lperf-simple + +@@ -123,8 +124,8 @@ if USE_ELFXX + LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la + endif + +-LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \ +- $(LIBUNWIND_ELF) $(LIBUNWIND) ++#LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \ ++# $(LIBUNWIND_ELF) $(LIBUNWIND) + + test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread + test_flush_cache_LDADD = $(LIBUNWIND_local) +@@ -159,6 +160,6 @@ Lperf_simple_LDADD = $(LIBUNWIND_local) + Ltest_trace_LDADD = $(LIBUNWIND_local) + Lperf_trace_LDADD = $(LIBUNWIND_local) + +-test_setjmp_LDADD = $(LIBUNWIND_setjmp) +-ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) ++#test_setjmp_LDADD = $(LIBUNWIND_setjmp) ++#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp) + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 86e241bd3f6e12300ca084399a7ec084e736d301
by git＠ipfire.org 27 Dec '12

27 Dec '12

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 86e241bd3f6e12300ca084399a7ec084e736d301 (commit) from 73623c34ea882612f8c15c339d01f5f72c28d7ab (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 86e241bd3f6e12300ca084399a7ec084e736d301 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Dec 27 14:53:54 2012 +0100 gettext: Update to 0.18.2. ----------------------------------------------------------------------- Summary of changes: gettext/gettext.nm | 4 ++-- gettext/patches/gettext-readlink-einval.patch | 24 ------------------------ 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 gettext/patches/gettext-readlink-einval.patch Difference in files: diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 5a9f367..7c7617b 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -4,8 +4,8 @@ ############################################################################### name = gettext -version = 0.18.1.1 -release = 8 +version = 0.18.2 +release = 1 groups = System/Base url = http://www.gnu.org/software/gettext/ diff --git a/gettext/patches/gettext-readlink-einval.patch b/gettext/patches/gettext-readlink-einval.patch deleted file mode 100644 index 4cc9092..0000000 --- a/gettext/patches/gettext-readlink-einval.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h ---- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-areadlink.h 2010-02-16 16:32:26.000000000 -0500 -+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-areadlink.h 2011-08-31 16:16:26.325521167 -0400 -@@ -36,7 +36,7 @@ test_areadlink (char * (*func) (char con - ASSERT (errno == ENOENT); - errno = 0; - ASSERT (func ("", 1) == NULL); -- ASSERT (errno == ENOENT); -+ ASSERT (errno == ENOENT || errno == EINVAL); - errno = 0; - ASSERT (func (".", 1) == NULL); - ASSERT (errno == EINVAL); -diff -U 3 -p -r gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h ---- gettext-0.18.1.1.orig/gettext-tools/gnulib-tests/test-readlink.h 2011-08-31 15:54:15.000000000 -0400 -+++ gettext-0.18.1.1/gettext-tools/gnulib-tests/test-readlink.h 2011-08-31 16:16:09.325165556 -0400 -@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con - ASSERT (errno == ENOENT); - errno = 0; - ASSERT (func ("", buf, sizeof buf) == -1); -- ASSERT (errno == ENOENT); -+ ASSERT (errno == ENOENT || errno == EINVAL); - errno = 0; - ASSERT (func (".", buf, sizeof buf) == -1); - ASSERT (errno == EINVAL); hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 73623c34ea882612f8c15c339d01f5f72c28d7ab
by git＠ipfire.org 26 Dec '12

26 Dec '12

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 73623c34ea882612f8c15c339d01f5f72c28d7ab (commit) from 154ced22c1117b9962d4e78a0e15bb20efcf3806 (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 73623c34ea882612f8c15c339d01f5f72c28d7ab Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 26 22:19:16 2012 +0100 ppl: Re-enable testsuite. ppl comes with a testsuite which should be executed, because ppl is a critical component for the build toolchain. Also enable parallel builds. ----------------------------------------------------------------------- Summary of changes: ppl/ppl.nm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Difference in files: diff --git a/ppl/ppl.nm b/ppl/ppl.nm index 03d8b7c..f9c53d8 100644 --- a/ppl/ppl.nm +++ b/ppl/ppl.nm @@ -5,7 +5,7 @@ name = ppl version = 1.0 -release = 1 +release = 1.1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Libraries @@ -41,11 +41,9 @@ build --enable-interfaces="c cxx" \ --disable-debugging - PARALLELISMFLAGS = - - #test - # make check - #end + test + make check + end install_cmds # Create compat symlink. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 154ced22c1117b9962d4e78a0e15bb20efcf3806
by git＠ipfire.org 25 Dec '12

25 Dec '12

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 154ced22c1117b9962d4e78a0e15bb20efcf3806 (commit) via bda54197bde452382858a1d84ca2d2448a90c746 (commit) from cb5b1e1436df5269259e2cec7ff2bd2d9c489402 (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 154ced22c1117b9962d4e78a0e15bb20efcf3806 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 25 20:11:31 2012 +0100 iptables: Update to 1.4.17. Comes with new extensions for the IPv6 NAT thingy. commit bda54197bde452382858a1d84ca2d2448a90c746 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 25 20:10:56 2012 +0100 man-pages: Update to 3.45. ----------------------------------------------------------------------- Summary of changes: iptables/iptables.nm | 7 +++++-- man-pages/man-pages.nm | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) Difference in files: diff --git a/iptables/iptables.nm b/iptables/iptables.nm index e220b0c..3ec7773 100644 --- a/iptables/iptables.nm +++ b/iptables/iptables.nm @@ -4,7 +4,7 @@ ############################################################################### name = iptables -version = 1.4.16.2 +version = 1.4.17 release = 1 groups = Networking/Tools @@ -42,7 +42,10 @@ build prepare_cmds # Make more space for target name on output. - cd iptables && sed -e "s/%-9s/%-18s/g" -i ip{,6}tables.c + sed -e "s/%-9s/%-18s/g" -i iptables/ip{,6}tables.c + + sed -i extensions/GNUmakefile* \ + -e "s@ip6t_NETMAP_LIBADD.*@& -L../libiptc/.libs@" end install_cmds diff --git a/man-pages/man-pages.nm b/man-pages/man-pages.nm index 7657750..bbce515 100644 --- a/man-pages/man-pages.nm +++ b/man-pages/man-pages.nm @@ -4,7 +4,7 @@ ############################################################################### name = man-pages -version = 3.40 +version = 3.45 release = 1 arch = noarch hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. cb5b1e1436df5269259e2cec7ff2bd2d9c489402
by git＠ipfire.org 23 Dec '12

23 Dec '12

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 cb5b1e1436df5269259e2cec7ff2bd2d9c489402 (commit) via 2a3a31bb86744ed566e1a143e55c9c1319e2a56f (commit) via 5808d83b73d58bd43e3f25f7d813decaa20849b3 (commit) via ef85f13686852bc692e419879ccd3ed3d785fdfc (commit) from 9d50ff5ebf3986ac57f207f169ab9dceb9320385 (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 cb5b1e1436df5269259e2cec7ff2bd2d9c489402 Merge: 2a3a31b 9d50ff5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 12:01:41 2012 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 2a3a31bb86744ed566e1a143e55c9c1319e2a56f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 12:00:32 2012 +0100 gcc: Rebuild with new ppl-1.0 and rebuilt cloog-ppl. commit 5808d83b73d58bd43e3f25f7d813decaa20849b3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 11:59:17 2012 +0100 cloog-ppl: Rebuild with ppl-1.0. commit ef85f13686852bc692e419879ccd3ed3d785fdfc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 11:57:15 2012 +0100 ppl: Update to 1.0. ----------------------------------------------------------------------- Summary of changes: cloog-ppl/cloog-ppl.nm | 10 +- .../patches/cloog-ppl-0.15.11-ppl-verfix.patch | 24 ++ gcc/gcc.nm | 13 +- gcc/patches/gcc47-cloog-dl.patch0 | 472 --------------------- ppl/ppl.nm | 39 +- 5 files changed, 70 insertions(+), 488 deletions(-) create mode 100644 cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch delete mode 100644 gcc/patches/gcc47-cloog-dl.patch0 Difference in files: diff --git a/cloog-ppl/cloog-ppl.nm b/cloog-ppl/cloog-ppl.nm index e8966be..9fed814 100644 --- a/cloog-ppl/cloog-ppl.nm +++ b/cloog-ppl/cloog-ppl.nm @@ -5,7 +5,7 @@ name = cloog-ppl version = 0.15.11 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries @@ -26,17 +26,17 @@ build requires autoconf automake - gmp-devel + gmp-devel >= 4.1.3 m4 - ppl-devel>=0.11.2 + ppl-devel >= 1.0 + texinfo >= 4.13 end configure_options += \ --with-ppl prepare_cmds - sed -i configure \ - -e "s/ppl_minor_version=10/ppl_minor_version=11/" + ./autogen.sh end test diff --git a/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch b/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch new file mode 100644 index 0000000..d0a2adc --- /dev/null +++ b/cloog-ppl/patches/cloog-ppl-0.15.11-ppl-verfix.patch @@ -0,0 +1,24 @@ +diff -up cloog-ppl-0.15.11/configure.in.verfix cloog-ppl-0.15.11/configure.in +--- cloog-ppl-0.15.11/configure.in.verfix 2012-12-03 16:46:17.295807008 -0500 ++++ cloog-ppl-0.15.11/configure.in 2012-12-03 16:46:59.010827161 -0500 +@@ -338,7 +338,7 @@ if test "x$with_ppl" != "x" -a "x$with_p + + AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) + AC_TRY_COMPILE([#include "ppl_c.h"],[ +- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 ++ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) +diff -up cloog-ppl-0.15.11/configure.verfix cloog-ppl-0.15.11/configure +--- cloog-ppl-0.15.11/configure.verfix 2012-12-03 16:47:21.996837121 -0500 ++++ cloog-ppl-0.15.11/configure 2012-12-03 16:47:34.893842170 -0500 +@@ -11222,7 +11222,7 @@ int + main () + { + +- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 ++ #if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10) + choke me + #endif + diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 2937ab6..a7a7a43 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1 name = gcc version = 4.7.2 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -48,8 +48,8 @@ build # If cloog support is enabled, we require the devel packages for build. if "%{build_cloog_ppl}" == "1" - requires += cloog-ppl-devel - requires += ppl-devel + requires += cloog-ppl-devel >= 0.15.11-2 + requires += ppl-devel >= 1.0 end # Build libquadmath (only on x86). @@ -95,7 +95,8 @@ build end if "%{build_cloog_ppl}" == "1" - configure_options += --with-cloog --with-ppl + configure_options += --with-cloog --with-ppl \ + --disable-ppl-version-check end # CFLAGS for hardening. @@ -455,6 +456,8 @@ packages end files + %{libdir}/libmudflap.so + %{libdir}/libmudflapth.so %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/mf-runtime.h %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflap.so %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflapth.so @@ -487,6 +490,7 @@ packages end files + %{libdir}/libquadmath.so %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath.h %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath_weak.h %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libquadmath.so @@ -519,6 +523,7 @@ packages end files + %{libdir}/libitm.so %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/itm.h %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/itm_weak.h %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libitm.so diff --git a/gcc/patches/gcc47-cloog-dl.patch0 b/gcc/patches/gcc47-cloog-dl.patch0 deleted file mode 100644 index 1ed7165..0000000 --- a/gcc/patches/gcc47-cloog-dl.patch0 +++ /dev/null @@ -1,472 +0,0 @@ -2011-01-04 Jakub Jelinek <jakub(a)redhat.com> - - * Makefile.in (BACKENDLIBS): Link against -ldl instead of - -lcloog -lppl. - (graphite.o, graphite%.o): Force -O, remove -fkeep-inline-functions. - (GRAPHITE_CLOOG_UTIL_H, GRAPHITE_POLY_H): New. - (graphite*.o): Adjust dependencies. - * graphite-cloog-compat.h: Include <dlfcn.h>. Reference libcloog and - libppl symbols through pointers in cloog_pointers__ variable. - * graphite.c (init_cloog_pointers): New function. - (graphite_transform_loops): Call init_cloog_pointers. - * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop): Rename - stmt_for argument to stmt_fora. - * graphite-poly.h: Include graphite-cloog-util.h. - ---- gcc/Makefile.in.jj 2011-01-03 13:44:14.163900902 +0100 -+++ gcc/Makefile.in 2011-01-04 17:48:53.588775911 +0100 -@@ -962,6 +962,8 @@ GCC_PLUGIN_H = gcc-plugin.h highlev-plug - PLUGIN_H = plugin.h $(GCC_PLUGIN_H) - PLUGIN_VERSION_H = plugin-version.h configargs.h - LIBFUNCS_H = libfuncs.h $(HASHTAB_H) -+GRAPHITE_CLOOG_UTIL_H = graphite-cloog-util.h graphite-cloog-compat.h -+GRAPHITE_POLY_H = graphite-poly.h $(GRAPHITE_CLOOG_UTIL_H) - - # - # Now figure out from those variables how to compile and link. -@@ -1016,7 +1018,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) - # and the system's installed libraries. - LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) \ - $(LIBDECNUMBER) $(HOST_LIBS) --BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ -+BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),-ldl) $(PLUGINLIBS) $(HOST_LIBS) \ - $(ZLIB) - # Any system libraries needed just for GNAT. - SYSLIBS = @GNAT_LIBEXC@ -@@ -2602,40 +2604,40 @@ sese.o : sese.c sese.h $(CONFIG_H) $(SYS - $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) tree-pass.h value-prof.h - graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) \ - $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h \ -- $(DBGCNT_H) graphite-ppl.h graphite-poly.h graphite-scop-detection.h \ -+ $(DBGCNT_H) graphite-ppl.h $(GRAPHITE_POLY_H) graphite-scop-detection.h \ - graphite-clast-to-gimple.h graphite-sese-to-poly.h - graphite-blocking.o : graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \ - $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \ -- $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \ -- graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \ -+ $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h $(GRAPHITE_CLOOG_UTIL_H) \ -+ graphite-ppl.h $(GRAPHITE_POLY_H) graphite-clast-to-gimple.h \ - graphite-dependences.h graphite-cloog-compat.h - graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \ -- coretypes.h graphite-cloog-util.h graphite-cloog-compat.h -+ coretypes.h $(GRAPHITE_CLOOG_UTIL_H) graphite-cloog-compat.h - graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \ -- graphite-cloog-util.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) graphite-dependences.h \ -+ $(GRAPHITE_CLOOG_UTIL_H) - graphite-flattening.o : graphite-flattening.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-interchange.o : graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ -- sese.h graphite-ppl.h graphite-poly.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) - graphite-poly.o : graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) gimple-pretty-print.h \ -- $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h graphite-poly.h \ -- graphite-dependences.h graphite-cloog-util.h -+ $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h $(GRAPHITE_POLY_H) \ -+ graphite-dependences.h $(GRAPHITE_CLOOG_UTIL_H) - graphite-ppl.o : graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ -- graphite-cloog-util.h graphite-ppl.h -+ $(GRAPHITE_CLOOG_UTIL_H) graphite-ppl.h - graphite-scop-detection.o : graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) \ -- sese.h graphite-ppl.h graphite-poly.h graphite-scop-detection.h -+ sese.h graphite-ppl.h $(GRAPHITE_POLY_H) graphite-scop-detection.h - graphite-sese-to-poly.o : graphite-sese-to-poly.c $(CONFIG_H) \ - $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) \ -- $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h graphite-poly.h \ -+ $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h $(GRAPHITE_POLY_H) \ - graphite-sese-to-poly.h - tree-vect-loop.o: tree-vect-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \ -@@ -3454,6 +3456,15 @@ $(common_out_object_file): $(common_out_ - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ - $< $(OUTPUT_OPTION) - -+graphite%.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite%.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+graphite.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+ - # Build auxiliary files that support ecoff format. - mips-tfile: mips-tfile.o $(LIBDEPS) - $(LINKER) $(LINKERFLAGS) $(LDFLAGS) -o $@ \ ---- gcc/graphite-cloog-compat.h.jj 2011-01-03 12:53:05.000000000 +0100 -+++ gcc/graphite-cloog-compat.h 2011-01-04 17:34:09.857757544 +0100 -@@ -272,4 +272,279 @@ static inline int cloog_matrix_nrows (Cl - return m->NbRows; - } - #endif /* CLOOG_ORG */ -+ -+#include <dlfcn.h> -+#if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11 -+#define DYNSYMS_PPL11 -+#else -+#define DYNSYMS_PPL11 \ -+ DYNSYM (ppl_new_PIP_Problem_from_constraints); \ -+ DYNSYM (ppl_PIP_Problem_is_satisfiable); \ -+ DYNSYM (ppl_delete_PIP_Problem); -+#endif -+#define DYNSYMS \ -+ DYNSYM (cloog_block_alloc); \ -+ DYNSYM (cloog_block_list_free); \ -+ DYNSYM (cloog_block_list_malloc); \ -+ DYNSYM (cloog_clast_create); \ -+ DYNSYM (cloog_clast_free); \ -+ DYNSYM (cloog_domain_free); \ -+ DYNSYM (cloog_domain_matrix2domain); \ -+ DYNSYM (cloog_initialize); \ -+ DYNSYM (cloog_loop_malloc); \ -+ DYNSYM (cloog_matrix_alloc); \ -+ DYNSYM (cloog_matrix_copy); \ -+ DYNSYM (cloog_matrix_free); \ -+ DYNSYM (cloog_matrix_print); \ -+ DYNSYM (cloog_names_malloc); \ -+ DYNSYM (cloog_names_scalarize); \ -+ DYNSYM (cloog_options_free); \ -+ DYNSYM (cloog_options_malloc); \ -+ DYNSYM (cloog_program_dump_cloog); \ -+ DYNSYM (cloog_program_extract_scalars); \ -+ DYNSYM (cloog_program_free); \ -+ DYNSYM (cloog_program_generate); \ -+ DYNSYM (cloog_program_malloc); \ -+ DYNSYM (cloog_program_print); \ -+ DYNSYM (cloog_program_scatter); \ -+ DYNSYM (cloog_statement_alloc); \ -+ DYNSYM (cloog_domain_union); \ -+ DYNSYM (cloog_matrix_read); \ -+ DYNSYM (cloog_new_pol); \ -+ DYNSYM (cloog_vector_gcd); \ -+ DYNSYM (ppl_finalize); \ -+ DYNSYM (ppl_assign_Coefficient_from_mpz_t); \ -+ DYNSYM (ppl_assign_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (ppl_Coefficient_to_mpz_t); \ -+ DYNSYM (ppl_Constraint_coefficient); \ -+ DYNSYM (ppl_Constraint_inhomogeneous_term); \ -+ DYNSYM (ppl_Constraint_space_dimension); \ -+ DYNSYM (ppl_Constraint_System_begin); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_dereference); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_equal_test); \ -+ DYNSYM (ppl_Constraint_System_const_iterator_increment); \ -+ DYNSYM (ppl_Constraint_System_end); \ -+ DYNSYM (ppl_Constraint_System_insert_Constraint); \ -+ DYNSYM (ppl_Constraint_System_space_dimension); \ -+ DYNSYM (ppl_Constraint_type); \ -+ DYNSYM (ppl_delete_Coefficient); \ -+ DYNSYM (ppl_delete_Constraint); \ -+ DYNSYM (ppl_delete_Constraint_System_const_iterator); \ -+ DYNSYM (ppl_delete_Linear_Expression); \ -+ DYNSYM (ppl_delete_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYM (ppl_delete_Pointset_Powerset_C_Polyhedron_iterator); \ -+ DYNSYM (ppl_delete_Polyhedron); \ -+ DYNSYM (ppl_Linear_Expression_add_to_coefficient); \ -+ DYNSYM (ppl_Linear_Expression_add_to_inhomogeneous); \ -+ DYNSYM (ppl_Linear_Expression_coefficient); \ -+ DYNSYM (ppl_Linear_Expression_inhomogeneous_term); \ -+ DYNSYM (ppl_Linear_Expression_space_dimension); \ -+ DYNSYM (ppl_new_Coefficient); \ -+ DYNSYM (ppl_new_Coefficient_from_mpz_t); \ -+ DYNSYM (ppl_new_Constraint); \ -+ DYNSYM (ppl_new_Constraint_System); \ -+ DYNSYM (ppl_new_Constraint_System_const_iterator); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_C_Polyhedron); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_space_dimension); \ -+ DYNSYM (ppl_new_C_Polyhedron_recycle_Constraint_System); \ -+ DYNSYM (ppl_new_Linear_Expression); \ -+ DYNSYM (ppl_new_Linear_Expression_from_Constraint); \ -+ DYNSYM (ppl_new_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (ppl_new_Linear_Expression_with_dimension); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension); \ -+ DYNSYM (ppl_new_Pointset_Powerset_C_Polyhedron_iterator); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_add_constraint); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_difference_assign); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_intersection_assign); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_is_empty); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_begin); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_end); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_iterator_increment); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_maximize); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_minimize); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_size); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_space_dimension); \ -+ DYNSYM (ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign); \ -+ DYNSYM (ppl_Polyhedron_add_constraint); \ -+ DYNSYM (ppl_Polyhedron_add_constraints); \ -+ DYNSYM (ppl_Polyhedron_add_space_dimensions_and_embed); \ -+ DYNSYM (ppl_Polyhedron_get_constraints); \ -+ DYNSYM (ppl_Polyhedron_map_space_dimensions); \ -+ DYNSYM (ppl_Polyhedron_remove_space_dimensions); \ -+ DYNSYM (ppl_Polyhedron_space_dimension); \ -+ DYNSYM (ppl_subtract_Linear_Expression_from_Linear_Expression); \ -+ DYNSYM (pprint); \ -+ DYNSYM (stmt_block); \ -+ DYNSYM (stmt_for); \ -+ DYNSYM (stmt_guard); \ -+ DYNSYM (stmt_root); \ -+ DYNSYM (stmt_user); \ -+ DYNSYM (stmt_ass); \ -+ DYNSYM (ppl_delete_Constraint_System); \ -+ DYNSYM (ppl_initialize); \ -+ DYNSYM (ppl_new_Constraint_System_from_Constraint); \ -+ DYNSYM (ppl_new_C_Polyhedron_from_Constraint_System); \ -+ DYNSYM (ppl_Polyhedron_affine_image); \ -+ DYNSYM (ppl_io_fprint_Pointset_Powerset_C_Polyhedron); \ -+ DYNSYMS_PPL11 -+extern struct cloog_pointers_s__ -+{ -+ bool inited; -+ void *h; -+#define DYNSYM(x) __typeof (x) *p_##x -+ DYNSYMS -+#undef DYNSYM -+} cloog_pointers__; -+ -+#define cloog_block_alloc (*cloog_pointers__.p_cloog_block_alloc) -+#define cloog_block_list_free (*cloog_pointers__.p_cloog_block_list_free) -+#define cloog_block_list_malloc (*cloog_pointers__.p_cloog_block_list_malloc) -+#define cloog_clast_create (*cloog_pointers__.p_cloog_clast_create) -+#define cloog_clast_free (*cloog_pointers__.p_cloog_clast_free) -+#define cloog_domain_free (*cloog_pointers__.p_cloog_domain_free) -+#define cloog_domain_matrix2domain (*cloog_pointers__.p_cloog_domain_matrix2domain) -+#define cloog_initialize (*cloog_pointers__.p_cloog_initialize) -+#ifndef CLOOG_ORG -+#undef cloog_loop_malloc -+#define cloog_loop_malloc(STATE) (*cloog_pointers__.p_cloog_loop_malloc) () -+#else -+#define cloog_loop_malloc (*cloog_pointers__.p_cloog_loop_malloc) -+#endif -+#define cloog_matrix_alloc (*cloog_pointers__.p_cloog_matrix_alloc) -+#define cloog_matrix_copy (*cloog_pointers__.p_cloog_matrix_copy) -+#define cloog_matrix_free (*cloog_pointers__.p_cloog_matrix_free) -+#define cloog_matrix_print (*cloog_pointers__.p_cloog_matrix_print) -+#define cloog_names_malloc (*cloog_pointers__.p_cloog_names_malloc) -+#define cloog_names_scalarize (*cloog_pointers__.p_cloog_names_scalarize) -+#define cloog_options_free (*cloog_pointers__.p_cloog_options_free) -+#ifndef CLOOG_ORG -+#undef cloog_options_malloc -+#define cloog_options_malloc(STATE) (*cloog_pointers__.p_cloog_options_malloc) () -+#undef cloog_program_dump_cloog -+#define cloog_program_dump_cloog(DUMPFILE, PROGRAM, SCATTERINGLIST) \ -+ (*cloog_pointers__.p_cloog_program_dump_cloog) (DUMPFILE, PROGRAM) -+#undef cloog_program_extract_scalars -+#define cloog_program_extract_scalars(PROG, SCATT, OPT) \ -+ (*cloog_pointers__.p_cloog_program_extract_scalars) (PROG, SCATT) -+#else -+#define cloog_options_malloc (*cloog_pointers__.p_cloog_options_malloc) -+#define cloog_program_dump_cloog (*cloog_pointers__.p_cloog_program_dump_cloog) -+#define cloog_program_extract_scalars (*cloog_pointers__.p_cloog_program_extract_scalars) -+#endif -+#define cloog_program_free (*cloog_pointers__.p_cloog_program_free) -+#define cloog_program_generate (*cloog_pointers__.p_cloog_program_generate) -+#define cloog_program_malloc (*cloog_pointers__.p_cloog_program_malloc) -+#define cloog_program_print (*cloog_pointers__.p_cloog_program_print) -+#ifndef CLOOG_ORG -+#undef cloog_program_scatter -+#define cloog_program_scatter(PROG, SCATT, OPT) \ -+ (*cloog_pointers__.p_cloog_program_scatter) (PROG, SCATT) -+#undef cloog_statement_alloc -+#define cloog_statement_alloc(STATE, INDEX) \ -+ (*cloog_pointers__.p_cloog_statement_alloc) (INDEX) -+#else -+#define cloog_program_scatter (*cloog_pointers__.p_cloog_program_scatter) -+#define cloog_statement_alloc (*cloog_pointers__.p_cloog_statement_alloc) -+#endif -+#define cloog_domain_union (*cloog_pointers__.p_cloog_domain_union) -+#define cloog_matrix_read (*cloog_pointers__.p_cloog_matrix_read) -+#define cloog_new_pol (*cloog_pointers__.p_cloog_new_pol) -+#define cloog_vector_gcd (*cloog_pointers__.p_cloog_vector_gcd) -+#define ppl_finalize (*cloog_pointers__.p_ppl_finalize) -+#define ppl_assign_Coefficient_from_mpz_t (*cloog_pointers__.p_ppl_assign_Coefficient_from_mpz_t) -+#define ppl_assign_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_assign_Linear_Expression_from_Linear_Expression) -+#define ppl_Coefficient_to_mpz_t (*cloog_pointers__.p_ppl_Coefficient_to_mpz_t) -+#define ppl_Constraint_coefficient (*cloog_pointers__.p_ppl_Constraint_coefficient) -+#define ppl_Constraint_inhomogeneous_term (*cloog_pointers__.p_ppl_Constraint_inhomogeneous_term) -+#define ppl_Constraint_space_dimension (*cloog_pointers__.p_ppl_Constraint_space_dimension) -+#define ppl_Constraint_System_begin (*cloog_pointers__.p_ppl_Constraint_System_begin) -+#define ppl_Constraint_System_const_iterator_dereference (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_dereference) -+#define ppl_Constraint_System_const_iterator_equal_test (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_equal_test) -+#define ppl_Constraint_System_const_iterator_increment (*cloog_pointers__.p_ppl_Constraint_System_const_iterator_increment) -+#define ppl_Constraint_System_end (*cloog_pointers__.p_ppl_Constraint_System_end) -+#define ppl_Constraint_System_insert_Constraint (*cloog_pointers__.p_ppl_Constraint_System_insert_Constraint) -+#define ppl_Constraint_System_space_dimension (*cloog_pointers__.p_ppl_Constraint_System_space_dimension) -+#define ppl_Constraint_type (*cloog_pointers__.p_ppl_Constraint_type) -+#define ppl_delete_Coefficient (*cloog_pointers__.p_ppl_delete_Coefficient) -+#define ppl_delete_Constraint (*cloog_pointers__.p_ppl_delete_Constraint) -+#define ppl_delete_Constraint_System_const_iterator (*cloog_pointers__.p_ppl_delete_Constraint_System_const_iterator) -+#define ppl_delete_Linear_Expression (*cloog_pointers__.p_ppl_delete_Linear_Expression) -+#define ppl_delete_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_delete_Pointset_Powerset_C_Polyhedron) -+#define ppl_delete_Pointset_Powerset_C_Polyhedron_iterator (*cloog_pointers__.p_ppl_delete_Pointset_Powerset_C_Polyhedron_iterator) -+#define ppl_delete_Polyhedron (*cloog_pointers__.p_ppl_delete_Polyhedron) -+#define ppl_Linear_Expression_add_to_coefficient (*cloog_pointers__.p_ppl_Linear_Expression_add_to_coefficient) -+#define ppl_Linear_Expression_add_to_inhomogeneous (*cloog_pointers__.p_ppl_Linear_Expression_add_to_inhomogeneous) -+#define ppl_Linear_Expression_coefficient (*cloog_pointers__.p_ppl_Linear_Expression_coefficient) -+#define ppl_Linear_Expression_inhomogeneous_term (*cloog_pointers__.p_ppl_Linear_Expression_inhomogeneous_term) -+#define ppl_Linear_Expression_space_dimension (*cloog_pointers__.p_ppl_Linear_Expression_space_dimension) -+#define ppl_new_Coefficient (*cloog_pointers__.p_ppl_new_Coefficient) -+#define ppl_new_Coefficient_from_mpz_t (*cloog_pointers__.p_ppl_new_Coefficient_from_mpz_t) -+#define ppl_new_Constraint (*cloog_pointers__.p_ppl_new_Constraint) -+#define ppl_new_Constraint_System (*cloog_pointers__.p_ppl_new_Constraint_System) -+#define ppl_new_Constraint_System_const_iterator (*cloog_pointers__.p_ppl_new_Constraint_System_const_iterator) -+#define ppl_new_C_Polyhedron_from_C_Polyhedron (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_C_Polyhedron) -+#define ppl_new_C_Polyhedron_from_space_dimension (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_space_dimension) -+#define ppl_new_C_Polyhedron_recycle_Constraint_System (*cloog_pointers__.p_ppl_new_C_Polyhedron_recycle_Constraint_System) -+#define ppl_new_Linear_Expression (*cloog_pointers__.p_ppl_new_Linear_Expression) -+#define ppl_new_Linear_Expression_from_Constraint (*cloog_pointers__.p_ppl_new_Linear_Expression_from_Constraint) -+#define ppl_new_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_new_Linear_Expression_from_Linear_Expression) -+#define ppl_new_Linear_Expression_with_dimension (*cloog_pointers__.p_ppl_new_Linear_Expression_with_dimension) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_from_space_dimension) -+#define ppl_new_Pointset_Powerset_C_Polyhedron_iterator (*cloog_pointers__.p_ppl_new_Pointset_Powerset_C_Polyhedron_iterator) -+#define ppl_Pointset_Powerset_C_Polyhedron_add_constraint (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_add_constraint) -+#define ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_add_space_dimensions_and_embed) -+#define ppl_Pointset_Powerset_C_Polyhedron_difference_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_difference_assign) -+#define ppl_Pointset_Powerset_C_Polyhedron_intersection_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_intersection_assign) -+#define ppl_Pointset_Powerset_C_Polyhedron_is_empty (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_is_empty) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_begin (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_begin) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_dereference) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_end (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_end) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test) -+#define ppl_Pointset_Powerset_C_Polyhedron_iterator_increment (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_iterator_increment) -+#define ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_map_space_dimensions) -+#define ppl_Pointset_Powerset_C_Polyhedron_maximize (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_maximize) -+#define ppl_Pointset_Powerset_C_Polyhedron_minimize (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_minimize) -+#define ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_remove_space_dimensions) -+#define ppl_Pointset_Powerset_C_Polyhedron_size (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_size) -+#define ppl_Pointset_Powerset_C_Polyhedron_space_dimension (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_space_dimension) -+#define ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign (*cloog_pointers__.p_ppl_Pointset_Powerset_C_Polyhedron_upper_bound_assign) -+#define ppl_Polyhedron_add_constraint (*cloog_pointers__.p_ppl_Polyhedron_add_constraint) -+#define ppl_Polyhedron_add_constraints (*cloog_pointers__.p_ppl_Polyhedron_add_constraints) -+#define ppl_Polyhedron_add_space_dimensions_and_embed (*cloog_pointers__.p_ppl_Polyhedron_add_space_dimensions_and_embed) -+#define ppl_Polyhedron_get_constraints (*cloog_pointers__.p_ppl_Polyhedron_get_constraints) -+#define ppl_Polyhedron_map_space_dimensions (*cloog_pointers__.p_ppl_Polyhedron_map_space_dimensions) -+#define ppl_Polyhedron_remove_space_dimensions (*cloog_pointers__.p_ppl_Polyhedron_remove_space_dimensions) -+#define ppl_Polyhedron_space_dimension (*cloog_pointers__.p_ppl_Polyhedron_space_dimension) -+#define ppl_subtract_Linear_Expression_from_Linear_Expression (*cloog_pointers__.p_ppl_subtract_Linear_Expression_from_Linear_Expression) -+#define pprint (*cloog_pointers__.p_pprint) -+#define stmt_block (*cloog_pointers__.p_stmt_block) -+#define stmt_for (*cloog_pointers__.p_stmt_for) -+#define stmt_guard (*cloog_pointers__.p_stmt_guard) -+#define stmt_root (*cloog_pointers__.p_stmt_root) -+#define stmt_user (*cloog_pointers__.p_stmt_user) -+#define stmt_ass (*cloog_pointers__.p_stmt_ass) -+#define ppl_delete_Constraint_System (*cloog_pointers__.p_ppl_delete_Constraint_System) -+#define ppl_initialize (*cloog_pointers__.p_ppl_initialize) -+#define ppl_new_Constraint_System_from_Constraint (*cloog_pointers__.p_ppl_new_Constraint_System_from_Constraint) -+#define ppl_new_C_Polyhedron_from_Constraint_System (*cloog_pointers__.p_ppl_new_C_Polyhedron_from_Constraint_System) -+#define ppl_Polyhedron_affine_image (*cloog_pointers__.p_ppl_Polyhedron_affine_image) -+#define ppl_io_fprint_Pointset_Powerset_C_Polyhedron (*cloog_pointers__.p_ppl_io_fprint_Pointset_Powerset_C_Polyhedron) -+#if !(PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11) -+#define ppl_new_PIP_Problem_from_constraints (*cloog_pointers__.p_ppl_new_PIP_Problem_from_constraints) -+#define ppl_PIP_Problem_is_satisfiable (*cloog_pointers__.p_ppl_PIP_Problem_is_satisfiable) -+#define ppl_delete_PIP_Problem (*cloog_pointers__.p_ppl_delete_PIP_Problem) -+#endif -+ -+#define cloog_finalize (*cloog_pointers__.p_ppl_finalize) -+ -+ - #endif /* GRAPHITE_CLOOG_COMPAT_H */ ---- gcc/graphite.c.jj 2011-01-03 12:53:05.194056513 +0100 -+++ gcc/graphite.c 2011-01-04 16:18:32.385007767 +0100 -@@ -56,6 +56,35 @@ along with GCC; see the file COPYING3. - - CloogState *cloog_state; - -+__typeof (cloog_pointers__) cloog_pointers__; -+ -+static bool -+init_cloog_pointers (void) -+{ -+ void *h; -+ -+ if (cloog_pointers__.inited) -+ return cloog_pointers__.h != NULL; -+ h = dlopen ("libcloog.so.0", RTLD_LAZY); -+ cloog_pointers__.h = h; -+ if (h == NULL) -+ return false; -+#define DYNSYM(x) \ -+ do \ -+ { \ -+ union { __typeof (cloog_pointers__.p_##x) p; void *q; } u; \ -+ u.q = dlsym (h, #x); \ -+ if (u.q == NULL) \ -+ return false; \ -+ cloog_pointers__.p_##x = u.p; \ -+ } \ -+ while (0) -+ DYNSYMS -+#undef DYNSYM -+ return true; -+} -+ -+ - /* Print global statistics to FILE. */ - - static void -@@ -201,6 +230,12 @@ graphite_initialize (void) - return false; - } - -+ if (!init_cloog_pointers ()) -+ { -+ sorry ("Graphite loop optimizations cannot be used"); -+ return false; -+ } -+ - scev_reset (); - recompute_all_dominators (); - initialize_original_copy_tables (); ---- gcc/graphite-clast-to-gimple.c.jj 2011-01-03 12:53:05.000000000 +0100 -+++ gcc/graphite-clast-to-gimple.c 2011-01-04 16:29:55.738007463 +0100 -@@ -836,7 +836,7 @@ clast_get_body_of_loop (struct clast_stm - from STMT_FOR. */ - - static tree --type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) -+type_for_clast_for (struct clast_for *stmt_fora, ivs_params_p ip) - { - mpz_t bound_one, bound_two; - tree lb_type, ub_type; -@@ -844,8 +844,8 @@ type_for_clast_for (struct clast_for *st - mpz_init (bound_one); - mpz_init (bound_two); - -- lb_type = type_for_clast_expr (stmt_for->LB, ip, bound_one, bound_two); -- ub_type = type_for_clast_expr (stmt_for->UB, ip, bound_one, bound_two); -+ lb_type = type_for_clast_expr (stmt_fora->LB, ip, bound_one, bound_two); -+ ub_type = type_for_clast_expr (stmt_fora->UB, ip, bound_one, bound_two); - - mpz_clear (bound_one); - mpz_clear (bound_two); ---- gcc/graphite-poly.h.jj 2011-01-03 12:53:05.000000000 +0100 -+++ gcc/graphite-poly.h 2011-01-04 17:35:53.308788629 +0100 -@@ -22,6 +22,8 @@ along with GCC; see the file COPYING3. - #ifndef GCC_GRAPHITE_POLY_H - #define GCC_GRAPHITE_POLY_H - -+#include "graphite-cloog-util.h" -+ - typedef struct poly_dr *poly_dr_p; - DEF_VEC_P(poly_dr_p); - DEF_VEC_ALLOC_P (poly_dr_p, heap); diff --git a/ppl/ppl.nm b/ppl/ppl.nm index a07cc99..03d8b7c 100644 --- a/ppl/ppl.nm +++ b/ppl/ppl.nm @@ -4,8 +4,8 @@ ############################################################################### name = ppl -version = 0.11.2 -release = 4 +version = 1.0 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Libraries @@ -27,14 +27,14 @@ description applications using the PPL through its C and C++ interfaces. end -source_dl = -sources = %{thisapp}.tar.lzma +source_dl = ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/ +sources = %{thisapp}.tar.xz build requires gcc-c++ - gmp-devel - m4 + gmp-devel >= 4.1.3 + m4 >= 1.4.8 end configure_options += \ @@ -43,17 +43,42 @@ build PARALLELISMFLAGS = - # The testsuite currently fails on x86_64. #test # make check #end + + install_cmds + # Create compat symlink. + ln -s libppl.so.12 %{BUILDROOT}%{libdir}/libppl.so.9 + end end packages package %{name} + package %{name}-compat + summary = Compat symlink for ppl-0.11. + description + This package pretends to ship libppl.so.9 for + compatibility reasons. + end + + # Provide the old version. + if "%{lib}" == "lib64" + provides += libppl.so.9()(64bit) + else + provides += libppl.so.9 + end + + files + %{libdir}/libppl.so.9 + end + end + package %{name}-devel template DEVEL + + requires += gmp-devel >= 4.1.3 end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9d50ff5ebf3986ac57f207f169ab9dceb9320385
by git＠ipfire.org 22 Dec '12

22 Dec '12

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 9d50ff5ebf3986ac57f207f169ab9dceb9320385 (commit) from 188aa825b9a7b18c966b218fe851e9fadd0205a3 (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 9d50ff5ebf3986ac57f207f169ab9dceb9320385 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 00:57:27 2012 +0100 dansguardian: Remove package. dansguardian is not developed in the open any more, so it is not our first choice for web filtering. ----------------------------------------------------------------------- Summary of changes: dansguardian/dansguardian.nm | 53 -------------------------- dansguardian/patches/dansguardian-gcc44.patch | 55 --------------------------- 2 files changed, 108 deletions(-) delete mode 100644 dansguardian/dansguardian.nm delete mode 100644 dansguardian/patches/dansguardian-gcc44.patch Difference in files: diff --git a/dansguardian/dansguardian.nm b/dansguardian/dansguardian.nm deleted file mode 100644 index 4ac512b..0000000 --- a/dansguardian/dansguardian.nm +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = dansguardian -version = 2.10.1.1 -release = 1 - -groups = Networking/Proxy -url = http://www.dansguardian.org/ -license = GPLv2+ -summary = A content filtering web proxy. - -description - DansGuardian filters the content of pages based on many methods including - phrase matching, PICS filtering and URL filtering. It does not purely filter - based on a banned list of sites. - - It provides real-time virus scanning capabilities for content access. - - DansGuardian is designed to be completely flexible and allows you to tailor the - filtering to your exact needs. It can be as draconian or as unobstructive as - you want. The default settings are geared towards what a primary school might - want but DansGuardian puts you in control of what you want to block. - - DansGuardian requires squid or another similar caching proxy server on your - local network. -end - -source_dl = - -build - requires - gcc-c++ - pcre-devel - pkg-config - zlib-devel - end - - configure_options += \ - --sysconfdir=/etc \ - --localstatedir=/var -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/dansguardian/patches/dansguardian-gcc44.patch b/dansguardian/patches/dansguardian-gcc44.patch deleted file mode 100644 index 3cdef6e..0000000 --- a/dansguardian/patches/dansguardian-gcc44.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ruN dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp dansguardian-2.10.1.1/src/ConnectionHandler.cpp ---- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100 -+++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-07-15 12:02:09.801533048 +0200 -@@ -45,6 +45,7 @@ - - #ifdef ENABLE_ORIG_IP - #include <linux/types.h> -+#include <limits.h> - #include <linux/netfilter_ipv4.h> - #endif - -diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp dansguardian-2.10.1.1/src/contentscanners/clamav.cpp ---- dansguardian-2.10.1.1.orig/src/contentscanners/clamav.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/contentscanners/clamav.cpp 2009-07-15 11:59:12.316495912 +0200 -@@ -26,6 +26,7 @@ - #include "../ContentScanner.hpp" - #include "../OptionContainer.hpp" - -+#include <cstdio> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> -diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp ---- dansguardian-2.10.1.1.orig/src/contentscanners/commandlinescan.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/contentscanners/commandlinescan.cpp 2009-07-15 11:59:12.317495697 +0200 -@@ -28,6 +28,7 @@ - #include "../OptionContainer.hpp" - #include "../RegExp.hpp" - -+#include <cstdio> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> -diff -ruN dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp ---- dansguardian-2.10.1.1.orig/src/contentscanners/icapscan.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/contentscanners/icapscan.cpp 2009-07-15 11:59:12.318495062 +0200 -@@ -29,6 +29,7 @@ - #include "../ContentScanner.hpp" - #include "../OptionContainer.hpp" - -+#include <cstdio> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> -diff -ruN dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp ---- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-07-15 11:59:12.319495964 +0200 -@@ -26,6 +26,7 @@ - #include "../HTMLTemplate.hpp" - #include "../ConnectionHandler.hpp" - -+#include <cstdio> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 188aa825b9a7b18c966b218fe851e9fadd0205a3
by git＠ipfire.org 22 Dec '12

22 Dec '12

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 188aa825b9a7b18c966b218fe851e9fadd0205a3 (commit) from 1b177c3e714ca5c66f90b6bf6c45aa2cea6598d3 (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 188aa825b9a7b18c966b218fe851e9fadd0205a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 23 00:54:01 2012 +0100 sed: Update to 4.2.2. ----------------------------------------------------------------------- Summary of changes: sed/sed.nm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/sed/sed.nm b/sed/sed.nm index 556ef7c..6f21595 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -4,8 +4,8 @@ ############################################################################### name = sed -version = 4.2.1 -release = 3 +version = 4.2.2 +release = 1 groups = Applications/Text url = http://sed.sourceforge.net/ @@ -13,14 +13,14 @@ license = GPLv2+ summary = A GNU stream text editor. description - The sed (Stream EDitor) editor is a stream or batch (non-interactive) \ - editor. Sed takes text as input, performs an operation or set of \ - operations on the text and outputs the modified text. The operations \ - that sed performs (substitutions, deletions, insertions, etc.) can be \ + The sed (Stream EDitor) editor is a stream or batch (non-interactive) + editor. Sed takes text as input, performs an operation or set of + operations on the text and outputs the modified text. The operations + that sed performs (substitutions, deletions, insertions, etc.) can be specified in a script file or from the command line. end -source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} +source_dl = ftp://ftp.gnu.org/gnu/sed/ build requires hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2012