IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7859 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9a883f3f53819fcf0f7de3c6596451cfbc3bcd60
by git＠ipfire.org 26 Apr '13

26 Apr '13

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 9a883f3f53819fcf0f7de3c6596451cfbc3bcd60 (commit) via 9b37e91ef6dfd93a257bf1ee802b1919e30d0f74 (commit) from 9856eec1cc29874d162fa67c9e9e1173d120aba2 (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 9a883f3f53819fcf0f7de3c6596451cfbc3bcd60 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 26 12:24:40 2013 +0200 Add new connection sorting code to core update 68. commit 9b37e91ef6dfd93a257bf1ee802b1919e30d0f74 Author: Kay-Michael Köhler <kay.michael.koehler(a)googlemail.com> Date: Fri Apr 26 12:21:08 2013 +0200 Make connection tracking list sortable. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/stage2 | 1 + config/rootfiles/core/68/filelists/files | 2 + html/cgi-bin/connections.cgi | 127 +++++++++++++++++++++++-- src/scripts/consort.sh | 158 +++++++++++++++++++++++++++++++ 4 files changed, 281 insertions(+), 7 deletions(-) create mode 100644 src/scripts/consort.sh Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index e10c649..1e91b37 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -71,6 +71,7 @@ usr/lib/libstdc++.so.6 #usr/local/bin/archive.files usr/local/bin/backupiso usr/local/bin/connscheduler +usr/local/bin/consort.sh usr/local/bin/dialctrl.pl usr/local/bin/hddshutdown usr/local/bin/httpscert diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 274e4e1..ad6864a 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -1,11 +1,13 @@ etc/system-release etc/issue etc/modprobe.d/blacklist +srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/html/themes/ipfire/include/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/maniac/include/style.css srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/local/bin/consort.sh var/ipfire/backup/include var/ipfire/header.pl var/ipfire/general-functions.pl diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 1edf3e5..d566cf7 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -34,6 +34,31 @@ require "${General::swroot}/header.pl"; my $colour_multicast = "#A0A0A0"; +# sort arguments for connection tracking table +# the sort field. eg. 1=src IP, 2=dst IP, 3=src port, 4=dst port +my $SORT_FIELD = 0; +# the sort order. (a)scending orr (d)escending +my $SORT_ORDER = 0; +# cgi query arguments +my %cgiin; +# debug mode +my $debug = 0; + +# retrieve query arguments +# note: let a-z A-Z and 0-9 pass as value only +if (length ($ENV{'QUERY_STRING'}) > 0){ + my $name; + my $value; + my $buffer = $ENV{'QUERY_STRING'}; + my @pairs = split(/&/, $buffer); + foreach my $pair (@pairs){ + ($name, $value) = split(/=/, $pair); + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " " + $value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass + $cgiin{$name} = $value; + } +} + &Header::showhttpheaders(); my @network=(); @@ -43,12 +68,40 @@ my @colour=(); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); +# output cgi query arrguments to browser on debug +if ( $debug ){ + &Header::openbox('100%', 'center', 'DEBUG'); + my $debugCount = 0; + foreach my $line (sort keys %cgiin) { + print "$line = '$cgiin{$line}'<br />\n"; + $debugCount++; + } + print " Count: $debugCount\n"; + &Header::closebox(); +} + #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::table1colour} ); undef (@dummy); -# Read the connection tracking table. -open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table"; +# check sorting arguments +if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) { + $SORT_FIELD = $cgiin{'sort_field'}; + + if ( $cgiin{'sort_order'} ~~ [ 'a','d','A','D' ] ) { + $SORT_ORDER = lc($cgiin{'sort_order'}); + } +} + +# Read and sort the connection tracking table +# do sorting +if ($SORT_FIELD and $SORT_ORDER) { + # field sorting when sorting arguments are sane + open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table"; +} else { + # default sorting with no query arguments + open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table"; +} my @conntrack = <CONNTRACK>; close(CONNTRACK); @@ -263,21 +316,81 @@ print <<END; <br> END +if ($SORT_FIELD and $SORT_ORDER) { + my @sort_field_name = ( + $Lang::tr{'source ip'}, + $Lang::tr{'destination ip'}, + $Lang::tr{'source port'}, + $Lang::tr{'destination port'}, + $Lang::tr{'protocol'}, + $Lang::tr{'connection'}.' '.$Lang::tr{'status'}, + $Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')', + $Lang::tr{'download'}, + $Lang::tr{'upload'} + ); + my $sort_order_name; + if (lc($SORT_ORDER) eq "a") { + $sort_order_name = $Lang::tr{'sort ascending'}; + } else { + $sort_order_name = $Lang::tr{'sort descending'}; + } + +print <<END + <div style="font-weight:bold;margin:10px;font-size: 70%"> + $sort_order_name: $sort_field_name[$SORT_FIELD-1] + </div> +END +; +} + # Print table header. print <<END; <table width='100%'> - <tr> + <tr valign="top""> <th align='center'> - $Lang::tr{'protocol'} + <a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center' colspan="2"> + <a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +          + <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center' colspan="2"> + <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +        + <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> </th> <th align='center'> - $Lang::tr{'source ip and port'} + <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +      + <a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center'> + <a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> </th> - <th> </th> <th align='center'> + <a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + </tr> + <tr valign="top""> + <th align='center'> + $Lang::tr{'protocol'} + </th> + <th align='center' colspan="2"> + $Lang::tr{'source ip and port'} + </th> + <th align='center' colspan="2"> $Lang::tr{'dest ip and port'} </th> - <th> </th> <th align='center'> $Lang::tr{'download'} / <br>$Lang::tr{'upload'} diff --git a/src/scripts/consort.sh b/src/scripts/consort.sh new file mode 100644 index 0000000..1682f7a --- /dev/null +++ b/src/scripts/consort.sh @@ -0,0 +1,158 @@ +#/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +# sort conntrack table entries based on ip addresses +# @parm sort field +do_ip_sort() { + sed \ + -r \ + 's/.*src=([0-9\.]+).*dst=([0-9\.]+).*src=.*/\'$1'#\0/' $FILE_NAME \ + | sort \ + -t. \ + -k 1,1n$SORT_ORDER -k 2,2n$SORT_ORDER -k 3,3n$SORT_ORDER -k 4,4n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on port addresses +# @parm sort field +do_port_sort() { + sed \ + -r \ + 's/.*sport=([0-9]+).*dport=([0-9]+).*src=.*/\'$1'#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on protocol +do_protocol_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+([a-zA-Z0-9]+)/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on connection status +do_status_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+[ ]+([a-zA-Z_0-9]+)[ ]+|^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+([ ]+)/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on connection time to life +do_ttl_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+([0-9]+)[ ]+/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on downloaded bytes +do_downloaded_bytes_sort() { + sed \ + -r \ + 's/.*src=.*bytes=([0-9]+).*src=/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on uploaded bytes +do_uploaded_bytes_sort() { + sed \ + -r \ + 's/.*src=.*bytes=([0-9]+).*/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +SORT_ORDER= +FILE_NAME= + +if [ $# -lt 2 ]; then + echo "Usage: consort <sort criteria 1=srcIp,2=dstIp,3=srcPort,4=dstPort,5=protocol,6=connection status> <a=ascending,d=descending> [input file]" + echo " consort.sh 1 a a.txt" + echo " cat a.txt | consort 1 d" + exit; +fi + +if [[ 'a d A D' =~ $2 ]]; then + if [[ 'd D' =~ $2 ]]; then + SORT_ORDER=r + fi +else + echo "Unknown sort order \"$2\"" + exit; +fi + +if [ $# == 3 ]; then + if [ ! -f $3 ]; then + echo "File not found." + exit; + fi + FILE_NAME=$3 +fi + +if [[ '1 2' =~ $1 ]]; then + do_ip_sort $1 +elif [[ '3 4' =~ $1 ]]; then + do_port_sort $(($1-2)) +elif [[ '5' =~ $1 ]]; then + do_protocol_sort +elif [[ '6' =~ $1 ]]; then + do_status_sort +elif [[ '7' =~ $1 ]]; then + do_ttl_sort +elif [[ '8' =~ $1 ]]; then + do_downloaded_bytes_sort +elif [[ '9' =~ $1 ]]; then + do_uploaded_bytes_sort +else + echo "Unknown sort criteria \"$1\"" +fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9856eec1cc29874d162fa67c9e9e1173d120aba2
by git＠ipfire.org 26 Apr '13

26 Apr '13

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 9856eec1cc29874d162fa67c9e9e1173d120aba2 (commit) from 158a431825715cbee07a12a78bea7f2430c4b58d (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 9856eec1cc29874d162fa67c9e9e1173d120aba2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 26 12:02:26 2013 +0200 Add perl-Sort-Natually module to core update 68. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/perl-Sort-Naturally | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/68/filelists/perl-Sort-Naturally Difference in files: diff --git a/config/rootfiles/core/68/filelists/perl-Sort-Naturally b/config/rootfiles/core/68/filelists/perl-Sort-Naturally new file mode 120000 index 0000000..9d70650 --- /dev/null +++ b/config/rootfiles/core/68/filelists/perl-Sort-Naturally @@ -0,0 +1 @@ +../../../common/perl-Sort-Naturally \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 158a431825715cbee07a12a78bea7f2430c4b58d
by git＠ipfire.org 26 Apr '13

26 Apr '13

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 158a431825715cbee07a12a78bea7f2430c4b58d (commit) from 3c836db413a0a9811e1cee698b3322824a494c7a (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 158a431825715cbee07a12a78bea7f2430c4b58d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Fri Apr 26 12:00:34 2013 +0200 perl-Sort-Naturally: New package. This package is required to sort array and other objects in a natural order. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/{HTML-Tagset => perl-Sort-Naturally} | 12 ++++++------ lfs/{MIME-Tools => perl-Sort-Naturally} | 9 +++++---- make.sh | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) copy config/rootfiles/common/{HTML-Tagset => perl-Sort-Naturally} (53%) copy lfs/{MIME-Tools => perl-Sort-Naturally} (94%) Difference in files: diff --git a/config/rootfiles/common/perl-Sort-Naturally b/config/rootfiles/common/perl-Sort-Naturally new file mode 100644 index 0000000..7ed6b56 --- /dev/null +++ b/config/rootfiles/common/perl-Sort-Naturally @@ -0,0 +1,6 @@ +usr/lib/perl5/site_perl/5.12.3/Sort +usr/lib/perl5/site_perl/5.12.3/Sort/Naturally.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally/.packlist +usr/share/man/man3/Sort::Naturally.3 diff --git a/lfs/perl-Sort-Naturally b/lfs/perl-Sort-Naturally new file mode 100644 index 0000000..30ea076 --- /dev/null +++ b/lfs/perl-Sort-Naturally @@ -0,0 +1,78 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.03 + +THISAPP = Sort-Naturally-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = fef2e36d1b1ea23ee79ec68b5872453f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3595421..c6211ad 100755 --- a/make.sh +++ b/make.sh @@ -697,6 +697,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake perl-Sort-Naturally ipfiremake vdradmin ipfiremake miau ipfiremake netsnmpd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3c836db413a0a9811e1cee698b3322824a494c7a
by git＠ipfire.org 25 Apr '13

25 Apr '13

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 3c836db413a0a9811e1cee698b3322824a494c7a (commit) via 62a13aec4ca768fcb03b8639e6c5ad1596a19ccd (commit) from 9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4 (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 3c836db413a0a9811e1cee698b3322824a494c7a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 25 12:33:53 2013 +0200 Add modified services.cgi to core update 68. commit 62a13aec4ca768fcb03b8639e6c5ad1596a19ccd Author: Joern-Ingo Weigert <jiweigert(a)ipfire.org> Date: Wed Apr 24 17:27:44 2013 +0200 services.cgi: Fix for depreciate-warning in httpd/error_log This patch fixes the depreciate warning in /var/log/httpd/error_log not to use a hash as reference So I changed: [...] print %link->{$key} [...] To: [...] print $link{link} [...] which solves the warning and should be good in future. Joern-Ingo Weigert <jiweigert(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 1 + html/cgi-bin/services.cgi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 10ccc2c..274e4e1 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -1,6 +1,7 @@ etc/system-release etc/issue etc/modprobe.d/blacklist +srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/html/themes/ipfire/include/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/maniac/include/style.css diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 22a9ac7..131cad8 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -125,11 +125,11 @@ END $lines++; if ($lines % 2){ print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>"; - print %link->{$key}; + print $link{$key}; print "</td>\n"; }else{ print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>"; - print %link->{$key}; + print $link{$key}; print "</td>\n"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ae577412af787c2b8ea9bae2529bc230c78312ca
by git＠ipfire.org 23 Apr '13

23 Apr '13

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 ae577412af787c2b8ea9bae2529bc230c78312ca (commit) via f892bffed3d268f0305dde0e25d9b3acc9860c7c (commit) via 8361588eb3f49e9aca0d9ae6a2a2fb77712b8619 (commit) via d8c6de58a462a10950f078f18a2f14525cec0a5b (commit) from 3c8feabab81c77fdace9ee9019ccfce07e5bd050 (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 ae577412af787c2b8ea9bae2529bc230c78312ca Merge: f892bff d8c6de5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 23 21:35:06 2013 +0200 Merge remote-tracking branch 'stevee/transmission-update' commit f892bffed3d268f0305dde0e25d9b3acc9860c7c Merge: 3c8feab 8361588 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 23 21:35:00 2013 +0200 Merge remote-tracking branch 'stevee/libnfsidmap-fix' commit 8361588eb3f49e9aca0d9ae6a2a2fb77712b8619 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 23 19:43:35 2013 +0200 libnfsidmap: Set pluginpath. Set the pluginpath for libnfsidmap to be able to dynamically load and find the required plugins. commit d8c6de58a462a10950f078f18a2f14525cec0a5b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 23 19:19:51 2013 +0200 transmission: Update to 2.77. Minor update to the latest stable version. A lot of more changes: * Splitt into subpackages - transmission, transmission-cli and transmission-daemon. * Create transmission user and group for daemon. * Add systemd file and scriptlet for daemon. ----------------------------------------------------------------------- Summary of changes: libnfsidmap/libnfsidmap.nm | 3 +- transmission/systemd/transmission-daemon.service | 11 +++ transmission/transmission.nm | 85 +++++++++++++++++++++++- 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 transmission/systemd/transmission-daemon.service Difference in files: diff --git a/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm index 40a8f14..7cd1bd1 100644 --- a/libnfsidmap/libnfsidmap.nm +++ b/libnfsidmap/libnfsidmap.nm @@ -5,7 +5,7 @@ name = libnfsidmap version = 0.25 -release = 1 +release = 2 groups = System/Libraries url = http://www.citi.umich.edu/projects/nfsv4/linux/ @@ -28,6 +28,7 @@ build end configure_options += \ + --with-pluginpath=%{libdir}/%{name} \ --disable-static prepare_cmds diff --git a/transmission/systemd/transmission-daemon.service b/transmission/systemd/transmission-daemon.service new file mode 100644 index 0000000..8692007 --- /dev/null +++ b/transmission/systemd/transmission-daemon.service @@ -0,0 +1,11 @@ +[Unit] +Description=Transmission Daemon +After=network.target + +[Service] +User=transmission +ExecStart=/usr/bin/transmission-daemon -f --blocklist -g /var/lib/transmission/.config/transmission + +[Install] +WantedBy=multi-user.target + diff --git a/transmission/transmission.nm b/transmission/transmission.nm index 7aaf8f2..78bef0d 100644 --- a/transmission/transmission.nm +++ b/transmission/transmission.nm @@ -4,7 +4,7 @@ ############################################################################### name = transmission -version = 2.22 +version = 2.77 release = 1 groups = Internet/P2P @@ -18,7 +18,7 @@ description end source_dl = http://download.transmissionbt.com/files/ -sources = %{thisapp}.tar.bz2 +sources = %{thisapp}.tar.xz build requires @@ -26,11 +26,92 @@ build libcurl-devel libevent-devel openssl-devel + shadow-utils + zlib-devel end + + prepare_cmds + # Create transmission user and group. + %{create_user} + end + + install_cmds + # Create missing folders and set correct ownership. + mkdir -pv %{BUILDROOT}%{sharedstatedir}/transmission + chown transmission:transmission %{BUILDROOT}%{sharedstatedir}/transmission + end +end + +create_user + getent group transmission >/dev/null || groupadd -r transmission + getent passwd transmission >/dev/null || \ + useradd -r -g transmission -d %{sharedstatedir}/transmission -s /sbin/nologin \ + -c "transmission daemon" transmission end packages package %{name} + + package %{name}-cli + summary = Transmission command line implementation. + description + Command line version of Transmission BitTorrent client. + end + + requires + transmission = %{thisver} + end + + files + %{bindir}/transmission-cli + %{mandir}/man1/transmission-cli* + end + end + + package %{name}-daemon + summary = Transmission daemon. + description + Transmission BitTorrent client daemon. + end + + prerequires += shadow-utils + + requires + transmission = %{thisver} + end + + datadir + %{sharedstatedir}/transmission + end + + files + %{bindir}/transmission-daemon + %{mandir}/man1/transmission-daemon* + %{unitdir}/transmission-daemon.service + %{sharedstatedir}/transmission + end + + script prein + %{create_user} + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable transmission-daemon.service >/dev/null 2>&1 || : + systemctl stop transmission-daemon.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart transmission-daemon.service >/dev/null 2>&1 || : + end 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. 3c8feabab81c77fdace9ee9019ccfce07e5bd050
by git＠ipfire.org 23 Apr '13

23 Apr '13

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 3c8feabab81c77fdace9ee9019ccfce07e5bd050 (commit) via 359e71fdf057920f505406d9ceaf89b7056cbdcd (commit) from 05cb8b09a912281250429564d711dbac009b4b7d (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 3c8feabab81c77fdace9ee9019ccfce07e5bd050 Merge: 05cb8b0 359e71f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 23 10:12:30 2013 +0200 Merge remote-tracking branch 'stevee/ntp-fix' commit 359e71fdf057920f505406d9ceaf89b7056cbdcd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 14 17:55:31 2013 +0200 ntp: Fix ownership of "/var/lib/ntp". The folder had the wrong owernship, so ntpd was not able to write to the containing file which may causes troubles and a lot of warnings in the log files. ----------------------------------------------------------------------- Summary of changes: ntp/ntp.nm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) Difference in files: diff --git a/ntp/ntp.nm b/ntp/ntp.nm index 2c97eee..9c8bb56 100644 --- a/ntp/ntp.nm +++ b/ntp/ntp.nm @@ -6,7 +6,7 @@ name = ntp version = %{ver_major}.6p5 ver_major = 4.2 -release = 1 +release = 2 groups = System/Daemons url = http://www.ntp.org/ @@ -41,6 +41,9 @@ build ln -svf ../ntpstat-0.2 . %{MACRO_PATCHES} + + # Create ntp user and group. + %{create_user} end configure_options += \ @@ -116,9 +119,18 @@ build mkdir -pv %{unitdir}/ntp-units.d echo "ntpd.service" > %{unitdir}/ntp-units.d/60-ntpd.list + + # Fix ownership. + chown -R ntp:ntp %{BUILDROOT}%{sharedstatedir}/ntp end end +create_user + getent group ntp >/dev/null || groupadd -g 38 ntp || : + getent passwd ntp >/dev/null || useradd -u 38 -g 38 -s /sbin/nologin \ + -M -r -d %{sysconfdir}/ntp ntp || : +end + packages package %{name} requires @@ -162,9 +174,7 @@ packages end script prein - getent group ntp >/dev/null || groupadd -g 38 ntp || : - getent passwd ntp >/dev/null || useradd -u 38 -g 38 -s /sbin/nologin \ - -M -r -d %{sysconfdir}/ntp ntp || : + %{create_user} end script postin hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 05cb8b09a912281250429564d711dbac009b4b7d
by git＠ipfire.org 18 Apr '13

18 Apr '13

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 05cb8b09a912281250429564d711dbac009b4b7d (commit) via 6c7e14526b616f47508f0dd1b8a873127071600b (commit) via 263b10b932811068f9ef3f3e71be5e76fc1ad619 (commit) via 6651acadf70dace7bfa60d2cef190ddc3f979d3a (commit) via b922df3a71343f607cd44f371704f3aa8168ad8c (commit) from 34b59fe263523d7c8a5a5300c8bef36f68de927d (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 05cb8b09a912281250429564d711dbac009b4b7d Merge: 6c7e145 34b59fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 18 14:26:49 2013 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 6c7e14526b616f47508f0dd1b8a873127071600b Merge: 263b10b 6651aca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 16 18:12:58 2013 +0200 Merge remote-tracking branch 'tebert/mc' commit 263b10b932811068f9ef3f3e71be5e76fc1ad619 Merge: 1efc735 b922df3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 16 18:12:34 2013 +0200 Merge remote-tracking branch 'tebert/diffutils' commit 6651acadf70dace7bfa60d2cef190ddc3f979d3a Author: Thomas Ebert <thomas.ebert(a)ipfire.org> Date: Mon Apr 15 21:45:54 2013 +0200 mc: Updated to recent version 4.8.8 Fix bug 10350 commit b922df3a71343f607cd44f371704f3aa8168ad8c Author: Thomas Ebert <thomas.ebert(a)ipfire.org> Date: Mon Apr 15 21:43:22 2013 +0200 diffutils: Updated to recent version 3.3 Fix bug 10349 ----------------------------------------------------------------------- Summary of changes: diffutils/diffutils.nm | 5 +++-- mc/mc.nm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index d664281..1ef95de 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -4,8 +4,8 @@ ############################################################################### name = diffutils -version = 3.2 -release = 5 +version = 3.3 +release = 1 groups = Development/Tools url = http://www.gnu.org/software/diffutils/diffutils.html @@ -20,6 +20,7 @@ description end source_dl = http://ftp.gnu.org/gnu/diffutils/ +sources = %{thisapp}.tar.xz build requires diff --git a/mc/mc.nm b/mc/mc.nm index c585ed6..7e37f53 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -4,7 +4,7 @@ ############################################################################### name = mc -version = 4.8.1.4 +version = 4.8.8 release = 1 epoch = 1 hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 34b59fe263523d7c8a5a5300c8bef36f68de927d
by git＠ipfire.org 14 Apr '13

14 Apr '13

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 34b59fe263523d7c8a5a5300c8bef36f68de927d (commit) via 90e71f0c361ede017b66412d5615dc4c8ecb26da (commit) via 9d4be168c9d2ff834108fff25f3edcbae3308bad (commit) from 1efc7351a29d2727123266a62f0de63330fb0956 (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 34b59fe263523d7c8a5a5300c8bef36f68de927d Merge: 90e71f0 1efc735 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 14 18:39:29 2013 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 90e71f0c361ede017b66412d5615dc4c8ecb26da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 14 18:38:56 2013 +0000 u-boot: Update to 2013.04-rc2. commit 9d4be168c9d2ff834108fff25f3edcbae3308bad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 14 18:37:44 2013 +0000 kernel: Ship DTB files on ARM. Remove patch for SMSC95xx to read the MAC address from the device tree. ----------------------------------------------------------------------- Summary of changes: kernel/kernel.nm | 18 ++++- ...port-reading-mac-address-from-device-tree.patch | 92 ---------------------- u-boot/patches/u-boot-fat.patch | 12 +++ u-boot/patches/uboot-omap-fit.patch | 9 +++ u-boot/u-boot.nm | 10 ++- 5 files changed, 46 insertions(+), 95 deletions(-) delete mode 100644 kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch create mode 100644 u-boot/patches/u-boot-fat.patch create mode 100644 u-boot/patches/uboot-omap-fit.patch Difference in files: diff --git a/kernel/kernel.nm b/kernel/kernel.nm index ab2e1df..5a1099b 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 3.8.6 -release = 1 +release = 2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -219,6 +219,21 @@ build make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \ %{kernel_build_flags} %{PARALLELISMFLAGS} + # Compile Flattened Device Tree database + case "${DISTRO_ARCH}" in + arm*) + make ARCH=%{kernel_arch} dtbs + + mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion} + for file in arch/arm/boot/dts/*.dtb; do + [ -e "${file}" ] || continue + + install -m 644 ${file} %{BUILDROOT}/boot/dtb-${fullversion} || exit 1 + rm -f ${file} + done + ;; + esac + # Install the results. mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/usr/lib/modules/${fullversion} install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion} @@ -387,6 +402,7 @@ packages files /boot/System.map-%{kernel_release} + /boot/dtb-%{kernel_release} /boot/vmlinuz-%{kernel_release} /boot/initramfs-%{kernel_release}.img /etc/ld.so.conf.d/kernel-%{kernel_release}.conf diff --git a/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch b/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch deleted file mode 100644 index a36c683..0000000 --- a/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 0b608345e114681f66ca0a3cf9d9434728da62ce Mon Sep 17 00:00:00 2001 -From: Ken Cox <ken(a)coxcampers.net> -Date: Thu, 23 Jun 2011 10:36:43 -0500 -Subject: [PATCH] Support reading mac address from device tree. - -If CONFIG_OF is enabled, we will try to read the mac address from the device tree. This enables us the ability to have a "static" mac address on arm boards such as the pandaboard and beagleboard which generate random mac addresses. ---- - drivers/net/usb/smsc75xx.c | 17 +++++++++++++++++ - drivers/net/usb/smsc95xx.c | 18 +++++++++++++++++- - 2 files changed, 34 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c -index 753ee6e..ac0a200 100644 ---- a/drivers/net/usb/smsc75xx.c -+++ b/drivers/net/usb/smsc75xx.c -@@ -29,6 +29,7 @@ - #include <linux/crc32.h> - #include <linux/usb/usbnet.h> - #include <linux/slab.h> -+#include <linux/of_device.h> - #include "smsc75xx.h" - - #define SMSC_CHIPNAME "smsc75xx" -@@ -658,6 +659,22 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) - - static void smsc75xx_init_mac_address(struct usbnet *dev) - { -+ void *address; -+#ifdef CONFIG_OF -+ struct device_node *np; -+ -+ /* try the device tree */ -+ np = of_find_node_by_name(NULL, "smsc75xx"); -+ if (np) { -+ address = of_get_property(np, "local-mac-address", NULL); -+ if (address) { -+ memcpy(dev->net->dev_addr, address, ETH_ALEN); -+ netif_dbg(dev, ifup, dev->net, "MAC address read from device tree\n"); -+ return; -+ } -+ } -+#endif -+ - /* try reading mac address from EEPROM */ - if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, - dev->net->dev_addr) == 0) { -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index bc86f4b..c83942d 100644 ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -29,6 +29,7 @@ - #include <linux/crc32.h> - #include <linux/usb/usbnet.h> - #include <linux/slab.h> -+#include <linux/of_device.h> - #include "smsc95xx.h" - - #define SMSC_CHIPNAME "smsc95xx" -@@ -639,6 +640,22 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) - - static void smsc95xx_init_mac_address(struct usbnet *dev) - { -+ void *address; -+#ifdef CONFIG_OF -+ struct device_node *np; -+ -+ /* try the device tree */ -+ np = of_find_node_by_name(NULL, "smsc95xx"); -+ if (np) { -+ address = of_get_property(np, "local-mac-address", NULL); -+ if (address) { -+ memcpy(dev->net->dev_addr, address, ETH_ALEN); -+ netif_dbg(dev, ifup, dev->net, "MAC address read from device tree\n"); -+ return; -+ } -+ } -+#endif -+ - /* try reading mac address from EEPROM */ - if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, - dev->net->dev_addr) == 0) { -@@ -648,7 +665,6 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) - return; - } - } -- - /* no eeprom, or eeprom values are invalid. generate random MAC */ - random_ether_addr(dev->net->dev_addr); - netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n"); --- -1.7.2.3 - diff --git a/u-boot/patches/u-boot-fat.patch b/u-boot/patches/u-boot-fat.patch new file mode 100644 index 0000000..1aa90bd --- /dev/null +++ b/u-boot/patches/u-boot-fat.patch @@ -0,0 +1,12 @@ +diff -uNr u-boot-2012.04.01.orig/fs/fat/fat.c u-boot-2012.04.01/fs/fat/fat.c +--- u-boot-2012.04.01.orig/fs/fat/fat.c 2012-04-25 08:22:50.000000000 -0500 ++++ u-boot-2012.04.01/fs/fat/fat.c 2012-06-19 14:06:16.605337811 -0500 +@@ -90,7 +90,7 @@ + /* Check for FAT12/FAT16/FAT32 filesystem */ + if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3)) + return 0; +- if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5)) ++ if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT", 3)) + return 0; + + cur_dev = NULL; diff --git a/u-boot/patches/uboot-omap-fit.patch b/u-boot/patches/uboot-omap-fit.patch new file mode 100644 index 0000000..cdcc79b --- /dev/null +++ b/u-boot/patches/uboot-omap-fit.patch @@ -0,0 +1,9 @@ +--- u-boot-2012.07/include/configs/omap4_common.h.orig 2013-01-24 00:20:40.334731642 -0600 ++++ u-boot-2012.07/include/configs/omap4_common.h 2013-01-24 00:21:08.708953803 -0600 +@@ -280,4 +280,6 @@ + + #define CONFIG_SYS_THUMB_BUILD + ++#define CONFIG_FIT ++ + #endif /* __CONFIG_OMAP4_COMMON_H */ diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm index fc04ab9..4099778 100644 --- a/u-boot/u-boot.nm +++ b/u-boot/u-boot.nm @@ -4,8 +4,10 @@ ############################################################################### name = u-boot -version = 2012.10 -release = 1 +version = 2013.04 +rc = 2 +release = 0.1.rc%{rc} +thisapp = %{name}-%{version}-rc%{rc} sup_arches = armv5tel armv7hl groups = Development/Tools @@ -22,6 +24,10 @@ source_dl = ftp://ftp.denx.de/pub/u-boot/ sources = %{thisapp}.tar.bz2 build + requires + dtc + end + build while read arch platform targets; do # Skip all other architectures. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1efc7351a29d2727123266a62f0de63330fb0956
by git＠ipfire.org 14 Apr '13

14 Apr '13

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 1efc7351a29d2727123266a62f0de63330fb0956 (commit) via 7f84cbd56fe203915620fa003aff0e2ccaf6d2eb (commit) via 75203eee9d91d687d27c6bb6958b52a799ba04ff (commit) from b91c8dd61cda16dba35771a7ccc0673c26a8f83c (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 1efc7351a29d2727123266a62f0de63330fb0956 Merge: 7f84cbd 75203ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 14 17:10:43 2013 +0200 Merge remote-tracking branch 'stevee/aiccu' commit 7f84cbd56fe203915620fa003aff0e2ccaf6d2eb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 14 16:45:31 2013 +0200 systemd: Update to 201. * Remove old patch for branding, because this doens't work in this way anymore. * Drop rpm stuff, we don't want to ship that. * Add dependeny to python-gobect3 for systemd-analyze. Fixes #10327. commit 75203eee9d91d687d27c6bb6958b52a799ba04ff Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 14 14:28:22 2013 +0200 aiccu: Add service file for systemd. Fixes #10348. ----------------------------------------------------------------------- Summary of changes: aiccu/aiccu.nm | 21 +++++++++++++++----- aiccu/systemd/aiccu@.service | 17 ++++++++++++++++ systemd/patches/systemd-187-ipfire.patch | 33 -------------------------------- systemd/systemd.nm | 19 ++++++++++++------ 4 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 aiccu/systemd/aiccu@.service delete mode 100644 systemd/patches/systemd-187-ipfire.patch Difference in files: diff --git a/aiccu/aiccu.nm b/aiccu/aiccu.nm index a879172..a97fb4e 100644 --- a/aiccu/aiccu.nm +++ b/aiccu/aiccu.nm @@ -5,7 +5,7 @@ name = aiccu version = 20070115 -release = 1 +release = 2 groups = System/Daemons url = http://www.sixxs.net/tools/aiccu/ @@ -19,6 +19,7 @@ description end source_dl = http://www.sixxs.net/archive/sixxs/aiccu/unix/ +sources = %{name}_%{version}.tar.gz build requires @@ -27,11 +28,10 @@ build DIR_APP = %{DIR_SRC}/%{name} - build - %{DO_FIX_LIBTOOL} - make %{PARALLELISMFLAGS} RPM_OPT_FLAGS="%{CFLAGS}" - end + make_build_targets += \ + RPM_OPT_FLAGS="%{CFLAGS}" + # Remove old sysvinit stuff and emtpy usr/share directory. install_cmds rm -rvf %{BUILDROOT}/{etc,usr/share} end @@ -39,6 +39,17 @@ end packages package %{name} + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end end package %{name}-debuginfo diff --git a/aiccu/systemd/aiccu@.service b/aiccu/systemd/aiccu@.service new file mode 100644 index 0000000..38653a6 --- /dev/null +++ b/aiccu/systemd/aiccu@.service @@ -0,0 +1,17 @@ +[Unit] +Description=AICCU (Automatic IPv6 Connectivity Configuration Utility) on %I + +[Service] +ExecStartPre=/usr/lib/network/helpers/aiccu-config-helper create %I +ExecStart=/usr/sbin/aiccu start /run/network/%I/aiccu.conf +ExecStop=/usr/sbin/aiccu stop /run/network/%I/aiccu.conf +ExecStopPost=/usr/lib/network/helpers/aiccu-config-helper remove %I + +UtmpIdentifier=%I + +# WARNING: never run AICCU from DaemonTools or a similar automated +# 'restart' tool/script. When AICCU does not start, it has a reason +# not to start which it gives on either the stdout or in the (sys)log +# file. The TIC server *will* automatically disable accounts which +# are detected to run in this mode. +Restart=no diff --git a/systemd/patches/systemd-187-ipfire.patch b/systemd/patches/systemd-187-ipfire.patch deleted file mode 100644 index fbd8ea6..0000000 --- a/systemd/patches/systemd-187-ipfire.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur a/configure.ac b/configure.ac ---- a/configure.ac 2012-07-20 00:40:32.000000000 +0200 -+++ b/configure.ac 2012-07-26 21:01:58.319135633 +0200 -@@ -504,7 +504,7 @@ - AC_PATH_PROG([XSLTPROC], [xsltproc]) - AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) - --AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) -+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom, ipfire or other])) - if test "z$with_distro" = "z"; then - if test "$cross_compiling" = yes; then - AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) -@@ -587,6 +587,12 @@ - AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) - M4_DEFINES=-DTARGET_MAGEIA=1 - ;; -+ ipfire) -+ SYSTEM_SYSVINIT_PATH= -+ SYSTEM_SYSVRCND_PATH= -+ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) -+ M4_DEFINES=-DTARGET_IPFIRE=1 -+ ;; - other) - ;; - *) -@@ -639,6 +645,7 @@ - AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) - AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) - AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) -+AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) - - AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") - diff --git a/systemd/systemd.nm b/systemd/systemd.nm index d93414b..9c1ca21 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################### name = systemd -version = 196 -release = 3 +version = 201 +release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -54,7 +54,9 @@ build end configure_options += \ - --with-distro=ipfire \ + --with-sysvinit-path= \ + --with-sysvrcnd-path= \ + --enable-introspection=yes \ --disable-static prepare_cmds @@ -101,15 +103,18 @@ build # Replace absolute symlinks by relative ones. cd %{BUILDROOT}%{unitdir}/../user - for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do + for i in bluetooth local-fs paths printer remote-fs shutdown smartcard sockets sound swap timers; do ln -svf ../system/${i}.target ${i}.target || exit 1 done # Remove tmpfile for X11 rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf - # Remove unneeded symlink for xdg - rm -rfv %{BUILDROOT}/etc/xdg/systemd + # Remove unneeded stuff for xdg + rm -rfv %{BUILDROOT}/etc/xdg + + # Remove unneeded stuff for rpm. + rm -rvf %{BUILDROOT}/etc/rpm # Use journald. Enable the import of kernel messages. # Stop forwarding to a syslog daemon. @@ -134,6 +139,7 @@ packages hwdata python-cairo python-dbus + python-gobject3 %{name}-units=%{thisver} util-linux>=2.19 end @@ -151,6 +157,7 @@ packages end conflicts + bash-completion < 2.1 dracut < 019 filesystem < 002 rsyslog < 5.8.6-4 hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b91c8dd61cda16dba35771a7ccc0673c26a8f83c
by git＠ipfire.org 13 Apr '13

13 Apr '13

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 b91c8dd61cda16dba35771a7ccc0673c26a8f83c (commit) via 4c3b79ae89d460dd9f03663b4e202c574b48ab56 (commit) from 2a35d6adf9475be6ebdc55230b5bdbc78af14382 (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 b91c8dd61cda16dba35771a7ccc0673c26a8f83c Merge: 2a35d6a 4c3b79a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 13 17:19:17 2013 +0200 Merge remote-tracking branch 'stevee/bash-completion-update' commit 4c3b79ae89d460dd9f03663b4e202c574b48ab56 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Apr 13 15:04:51 2013 +0200 bash-completion: Update to 2.1. This is an update to the latest stable version of bash-completion. ----------------------------------------------------------------------- Summary of changes: bash-completion/bash-completion.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm index 2648f96..cf944d3 100644 --- a/bash-completion/bash-completion.nm +++ b/bash-completion/bash-completion.nm @@ -4,8 +4,8 @@ ############################################################################### name = bash-completion -version = 1.99 -release = 2 +version = 2.1 +release = 1 arch = noarch groups = Development/Languages hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM