IPFire-SCM June 2014

ipfire-scm@lists.ipfire.org

1 participants
72 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core79, created. a65b9c3268ffacc27e703025ffd246e95f906a79
by git＠ipfire.org 06 Jun '14

06 Jun '14

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, core79 has been created at a65b9c3268ffacc27e703025ffd246e95f906a79 (commit) - Log ----------------------------------------------------------------- commit a65b9c3268ffacc27e703025ffd246e95f906a79 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 6 10:17:54 2014 +0200 core78 -> core79: to insert openssl security update. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core78, updated. f891fd74bdc6e12f0a69a554d4a00ad5c8687803
by git＠ipfire.org 06 Jun '14

06 Jun '14

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, core78 has been updated via f891fd74bdc6e12f0a69a554d4a00ad5c8687803 (commit) from 34a5f039399d782e090be2fa42604de9380ccaec (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 f891fd74bdc6e12f0a69a554d4a00ad5c8687803 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 5 17:54:46 2014 +0200 core78: fix typo in filelist. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/78/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index c0fa689..bda32bc 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -11,7 +11,7 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/bin/squidGuard -usr/sbin/firewall_policy +usr/sbin/firewall-policy usr/sbin/redirect_wrapper usr/sbin/updxlrator usr/local/bin/setddns.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 34a5f039399d782e090be2fa42604de9380ccaec
by git＠ipfire.org 05 Jun '14

05 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 34a5f039399d782e090be2fa42604de9380ccaec (commit) via 43ea947fb413125d577225f81c138b449c7247f1 (commit) from e3b309978704e66a4c9bb616ccf25d069ed159aa (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 34a5f039399d782e090be2fa42604de9380ccaec Merge: 43ea947 e3b3099 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 5 08:42:56 2014 +0200 Merge remote-tracking branch 'origin/master' into core78 commit 43ea947fb413125d577225f81c138b449c7247f1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 4 19:55:59 2014 +0200 core78: add more changed files to updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/78/filelists/files | 3 +++ config/rootfiles/core/78/filelists/perl-Device-Modem | 1 + config/rootfiles/core/78/filelists/perl-Device-SerialPort | 1 + 3 files changed, 5 insertions(+) create mode 120000 config/rootfiles/core/78/filelists/perl-Device-Modem create mode 120000 config/rootfiles/core/78/filelists/perl-Device-SerialPort Difference in files: diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index 851ce36..c0fa689 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -7,12 +7,15 @@ srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/modem-status.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/bin/squidGuard +usr/sbin/firewall_policy usr/sbin/redirect_wrapper usr/sbin/updxlrator usr/local/bin/setddns.pl +var/ipfire/header.pl var/ipfire/langs var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/core/78/filelists/perl-Device-Modem b/config/rootfiles/core/78/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/perl-Device-SerialPort b/config/rootfiles/core/78/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ 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. 0ee45bcff61a57c924cea6642ae3961e7b0675c3
by git＠ipfire.org 05 Jun '14

05 Jun '14

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 0ee45bcff61a57c924cea6642ae3961e7b0675c3 (commit) via e3b309978704e66a4c9bb616ccf25d069ed159aa (commit) from 602e26a56529ab13a041a2b3e535655a122edff4 (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 0ee45bcff61a57c924cea6642ae3961e7b0675c3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 5 08:44:14 2014 +0200 sane: update to 1.0.24. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/sane | 372 ++++++++++++++------------- lfs/sane | 8 +- src/patches/net-tools-1.60-no-hostname.patch | 52 ++++ 3 files changed, 250 insertions(+), 182 deletions(-) create mode 100644 src/patches/net-tools-1.60-no-hostname.patch Difference in files: diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane index 411243e..4fd9b98 100644 --- a/config/rootfiles/packages/sane +++ b/config/rootfiles/packages/sane @@ -36,6 +36,7 @@ etc/sane.d/hp5400.conf etc/sane.d/hs2p.conf etc/sane.d/ibm.conf etc/sane.d/kodak.conf +etc/sane.d/kodakaio.conf etc/sane.d/leo.conf etc/sane.d/lexmark.conf etc/sane.d/ma1509.conf @@ -79,427 +80,440 @@ usr/bin/gamma4scanimage usr/bin/sane-config usr/bin/sane-find-scanner usr/bin/scanimage -usr/doc/sane-1.0.22 -usr/doc/sane-1.0.22/AUTHORS -usr/doc/sane-1.0.22/COPYING -usr/doc/sane-1.0.22/ChangeLog -usr/doc/sane-1.0.22/LICENSE -usr/doc/sane-1.0.22/NEWS -usr/doc/sane-1.0.22/PROBLEMS -usr/doc/sane-1.0.22/PROJECTS -usr/doc/sane-1.0.22/README -#usr/doc/sane-1.0.22/README.aix -#usr/doc/sane-1.0.22/README.beos -#usr/doc/sane-1.0.22/README.darwin -usr/doc/sane-1.0.22/README.djpeg -#usr/doc/sane-1.0.22/README.freebsd -#usr/doc/sane-1.0.22/README.hp-ux -usr/doc/sane-1.0.22/README.linux -#usr/doc/sane-1.0.22/README.netbsd -#usr/doc/sane-1.0.22/README.openbsd -#usr/doc/sane-1.0.22/README.os2 -#usr/doc/sane-1.0.22/README.solaris -#usr/doc/sane-1.0.22/README.unixware2 -#usr/doc/sane-1.0.22/README.unixware7 -#usr/doc/sane-1.0.22/README.windows -#usr/doc/sane-1.0.22/README.zeta -#usr/doc/sane-1.0.22/backend-writing.txt -usr/doc/sane-1.0.22/canon -usr/doc/sane-1.0.22/canon/canon.changes -usr/doc/sane-1.0.22/canon/canon.install2700F.txt -#usr/doc/sane-1.0.22/gt68xx -usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES -usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO -#usr/doc/sane-1.0.22/leo -usr/doc/sane-1.0.22/leo/leo.txt -#usr/doc/sane-1.0.22/matsushita -usr/doc/sane-1.0.22/matsushita/matsushita.txt -#usr/doc/sane-1.0.22/mustek -usr/doc/sane-1.0.22/mustek/mustek.CHANGES -#usr/doc/sane-1.0.22/mustek_usb -usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES -usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO -#usr/doc/sane-1.0.22/mustek_usb2 -usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES -usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO -#usr/doc/sane-1.0.22/niash -usr/doc/sane-1.0.22/niash/niash.TODO -#usr/doc/sane-1.0.22/plustek -usr/doc/sane-1.0.22/plustek/FAQ -usr/doc/sane-1.0.22/plustek/MakeModule.sh -#usr/doc/sane-1.0.22/plustek/Makefile.kernel24 -usr/doc/sane-1.0.22/plustek/Makefile.kernel26 -usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt -usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes -usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt -usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt -usr/doc/sane-1.0.22/plustek/Plustek-USB.changes -usr/doc/sane-1.0.22/plustek/Plustek-USB.txt -usr/doc/sane-1.0.22/sane-backends-external.html -usr/doc/sane-1.0.22/sane-backends.html -usr/doc/sane-1.0.22/sane-mfgs-external.html -usr/doc/sane-1.0.22/sane-mfgs.html -#usr/doc/sane-1.0.22/sceptre -usr/doc/sane-1.0.22/sceptre/s1200.txt -#usr/doc/sane-1.0.22/teco -usr/doc/sane-1.0.22/teco/teco1.txt -usr/doc/sane-1.0.22/teco/teco2.txt -usr/doc/sane-1.0.22/teco/teco3.txt -#usr/doc/sane-1.0.22/u12 -usr/doc/sane-1.0.22/u12/U12.changes -usr/doc/sane-1.0.22/u12/U12.todo -#usr/doc/sane-1.0.22/umax -usr/doc/sane-1.0.22/umax/negative-types.txt -usr/doc/sane-1.0.22/umax/sane-logo.jpg -usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg -usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg -usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg -usr/doc/sane-1.0.22/umax/sane-umax-text.jpg -usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg -usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg -usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html -usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html -usr/doc/sane-1.0.22/umax/sane-umax.jpg -usr/doc/sane-1.0.22/umax/umax.BUGS -usr/doc/sane-1.0.22/umax/umax.CHANGES -usr/doc/sane-1.0.22/umax/umax.FAQ -usr/doc/sane-1.0.22/umax/umax.TODO +usr/doc/sane-1.0.24 +#usr/doc/sane-1.0.24/AUTHORS +#usr/doc/sane-1.0.24/COPYING +#usr/doc/sane-1.0.24/ChangeLog +#usr/doc/sane-1.0.24/LICENSE +#usr/doc/sane-1.0.24/NEWS +#usr/doc/sane-1.0.24/PROBLEMS +#usr/doc/sane-1.0.24/PROJECTS +#usr/doc/sane-1.0.24/README +#usr/doc/sane-1.0.24/README.aix +#usr/doc/sane-1.0.24/README.beos +#usr/doc/sane-1.0.24/README.darwin +#usr/doc/sane-1.0.24/README.djpeg +#usr/doc/sane-1.0.24/README.freebsd +#usr/doc/sane-1.0.24/README.hp-ux +#usr/doc/sane-1.0.24/README.linux +#usr/doc/sane-1.0.24/README.netbsd +#usr/doc/sane-1.0.24/README.openbsd +#usr/doc/sane-1.0.24/README.os2 +#usr/doc/sane-1.0.24/README.solaris +#usr/doc/sane-1.0.24/README.unixware2 +#usr/doc/sane-1.0.24/README.unixware7 +#usr/doc/sane-1.0.24/README.windows +#usr/doc/sane-1.0.24/README.zeta +#usr/doc/sane-1.0.24/backend-writing.txt +#usr/doc/sane-1.0.24/canon +#usr/doc/sane-1.0.24/canon/canon.changes +#usr/doc/sane-1.0.24/canon/canon.install2700F.txt +#usr/doc/sane-1.0.24/gt68xx +#usr/doc/sane-1.0.24/gt68xx/gt68xx.CHANGES +#usr/doc/sane-1.0.24/gt68xx/gt68xx.TODO +#usr/doc/sane-1.0.24/leo +#usr/doc/sane-1.0.24/leo/leo.txt +#usr/doc/sane-1.0.24/matsushita +#usr/doc/sane-1.0.24/matsushita/matsushita.txt +#usr/doc/sane-1.0.24/mustek +#usr/doc/sane-1.0.24/mustek/mustek.CHANGES +#usr/doc/sane-1.0.24/mustek_usb +#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.CHANGES +#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.TODO +#usr/doc/sane-1.0.24/mustek_usb2 +#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.CHANGES +#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.TODO +#usr/doc/sane-1.0.24/niash +#usr/doc/sane-1.0.24/niash/niash.TODO +#usr/doc/sane-1.0.24/plustek +#usr/doc/sane-1.0.24/plustek/FAQ +#usr/doc/sane-1.0.24/plustek/MakeModule.sh +#usr/doc/sane-1.0.24/plustek/Makefile.kernel24 +#usr/doc/sane-1.0.24/plustek/Makefile.kernel26 +#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT-TODO.txt +#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.changes +#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.txt +#usr/doc/sane-1.0.24/plustek/Plustek-USB-TODO.txt +#usr/doc/sane-1.0.24/plustek/Plustek-USB.changes +#usr/doc/sane-1.0.24/plustek/Plustek-USB.txt +#usr/doc/sane-1.0.24/sane-backends-external.html +#usr/doc/sane-1.0.24/sane-backends.html +#usr/doc/sane-1.0.24/sane-mfgs-external.html +#usr/doc/sane-1.0.24/sane-mfgs.html +#usr/doc/sane-1.0.24/sceptre +#usr/doc/sane-1.0.24/sceptre/s1200.txt +#usr/doc/sane-1.0.24/teco +#usr/doc/sane-1.0.24/teco/teco1.txt +#usr/doc/sane-1.0.24/teco/teco2.txt +#usr/doc/sane-1.0.24/teco/teco3.txt +#usr/doc/sane-1.0.24/u12 +#usr/doc/sane-1.0.24/u12/U12.changes +#usr/doc/sane-1.0.24/u12/U12.todo +#usr/doc/sane-1.0.24/umax +#usr/doc/sane-1.0.24/umax/negative-types.txt +#usr/doc/sane-1.0.24/umax/sane-logo.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-advanced-options-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-advanced.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-astra-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-config-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-histogram.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-mirage-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-not-listed-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-others-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-parport-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-powerlook-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-scanner-clones-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-speed-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-standard-options-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-standard.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-text.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-text2.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-text4.jpg +#usr/doc/sane-1.0.24/umax/sane-umax-uc-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax-vista-doc.html +#usr/doc/sane-1.0.24/umax/sane-umax.jpg +#usr/doc/sane-1.0.24/umax/umax.BUGS +#usr/doc/sane-1.0.24/umax/umax.CHANGES +#usr/doc/sane-1.0.24/umax/umax.FAQ +#usr/doc/sane-1.0.24/umax/umax.TODO #usr/include/sane usr/include/sane/sane.h usr/include/sane/saneopts.h #usr/lib/libsane.la usr/lib/libsane.so usr/lib/libsane.so.1 -usr/lib/libsane.so.1.0.22 +usr/lib/libsane.so.1.0.24 +#usr/lib/pkgconfig/sane-backends.pc #usr/lib/sane #usr/lib/sane/libsane-abaton.la usr/lib/sane/libsane-abaton.so usr/lib/sane/libsane-abaton.so.1 -usr/lib/sane/libsane-abaton.so.1.0.22 +usr/lib/sane/libsane-abaton.so.1.0.24 #usr/lib/sane/libsane-agfafocus.la usr/lib/sane/libsane-agfafocus.so usr/lib/sane/libsane-agfafocus.so.1 -usr/lib/sane/libsane-agfafocus.so.1.0.22 +usr/lib/sane/libsane-agfafocus.so.1.0.24 #usr/lib/sane/libsane-apple.la usr/lib/sane/libsane-apple.so usr/lib/sane/libsane-apple.so.1 -usr/lib/sane/libsane-apple.so.1.0.22 +usr/lib/sane/libsane-apple.so.1.0.24 #usr/lib/sane/libsane-artec.la usr/lib/sane/libsane-artec.so usr/lib/sane/libsane-artec.so.1 -usr/lib/sane/libsane-artec.so.1.0.22 +usr/lib/sane/libsane-artec.so.1.0.24 #usr/lib/sane/libsane-artec_eplus48u.la usr/lib/sane/libsane-artec_eplus48u.so usr/lib/sane/libsane-artec_eplus48u.so.1 -usr/lib/sane/libsane-artec_eplus48u.so.1.0.22 +usr/lib/sane/libsane-artec_eplus48u.so.1.0.24 #usr/lib/sane/libsane-as6e.la usr/lib/sane/libsane-as6e.so usr/lib/sane/libsane-as6e.so.1 -usr/lib/sane/libsane-as6e.so.1.0.22 +usr/lib/sane/libsane-as6e.so.1.0.24 #usr/lib/sane/libsane-avision.la usr/lib/sane/libsane-avision.so usr/lib/sane/libsane-avision.so.1 -usr/lib/sane/libsane-avision.so.1.0.22 +usr/lib/sane/libsane-avision.so.1.0.24 #usr/lib/sane/libsane-bh.la usr/lib/sane/libsane-bh.so usr/lib/sane/libsane-bh.so.1 -usr/lib/sane/libsane-bh.so.1.0.22 +usr/lib/sane/libsane-bh.so.1.0.24 #usr/lib/sane/libsane-canon.la usr/lib/sane/libsane-canon.so usr/lib/sane/libsane-canon.so.1 -usr/lib/sane/libsane-canon.so.1.0.22 +usr/lib/sane/libsane-canon.so.1.0.24 #usr/lib/sane/libsane-canon630u.la usr/lib/sane/libsane-canon630u.so usr/lib/sane/libsane-canon630u.so.1 -usr/lib/sane/libsane-canon630u.so.1.0.22 +usr/lib/sane/libsane-canon630u.so.1.0.24 #usr/lib/sane/libsane-canon_dr.la usr/lib/sane/libsane-canon_dr.so usr/lib/sane/libsane-canon_dr.so.1 -usr/lib/sane/libsane-canon_dr.so.1.0.22 +usr/lib/sane/libsane-canon_dr.so.1.0.24 #usr/lib/sane/libsane-cardscan.la usr/lib/sane/libsane-cardscan.so usr/lib/sane/libsane-cardscan.so.1 -usr/lib/sane/libsane-cardscan.so.1.0.22 +usr/lib/sane/libsane-cardscan.so.1.0.24 #usr/lib/sane/libsane-coolscan.la usr/lib/sane/libsane-coolscan.so usr/lib/sane/libsane-coolscan.so.1 -usr/lib/sane/libsane-coolscan.so.1.0.22 +usr/lib/sane/libsane-coolscan.so.1.0.24 #usr/lib/sane/libsane-coolscan2.la usr/lib/sane/libsane-coolscan2.so usr/lib/sane/libsane-coolscan2.so.1 -usr/lib/sane/libsane-coolscan2.so.1.0.22 +usr/lib/sane/libsane-coolscan2.so.1.0.24 #usr/lib/sane/libsane-coolscan3.la usr/lib/sane/libsane-coolscan3.so usr/lib/sane/libsane-coolscan3.so.1 -usr/lib/sane/libsane-coolscan3.so.1.0.22 +usr/lib/sane/libsane-coolscan3.so.1.0.24 #usr/lib/sane/libsane-dc210.la usr/lib/sane/libsane-dc210.so usr/lib/sane/libsane-dc210.so.1 -usr/lib/sane/libsane-dc210.so.1.0.22 +usr/lib/sane/libsane-dc210.so.1.0.24 #usr/lib/sane/libsane-dc240.la usr/lib/sane/libsane-dc240.so usr/lib/sane/libsane-dc240.so.1 -usr/lib/sane/libsane-dc240.so.1.0.22 +usr/lib/sane/libsane-dc240.so.1.0.24 #usr/lib/sane/libsane-dc25.la usr/lib/sane/libsane-dc25.so usr/lib/sane/libsane-dc25.so.1 -usr/lib/sane/libsane-dc25.so.1.0.22 +usr/lib/sane/libsane-dc25.so.1.0.24 #usr/lib/sane/libsane-dell1600n_net.la usr/lib/sane/libsane-dell1600n_net.so usr/lib/sane/libsane-dell1600n_net.so.1 -usr/lib/sane/libsane-dell1600n_net.so.1.0.22 +usr/lib/sane/libsane-dell1600n_net.so.1.0.24 #usr/lib/sane/libsane-dll.la usr/lib/sane/libsane-dll.so usr/lib/sane/libsane-dll.so.1 -usr/lib/sane/libsane-dll.so.1.0.22 +usr/lib/sane/libsane-dll.so.1.0.24 #usr/lib/sane/libsane-dmc.la usr/lib/sane/libsane-dmc.so usr/lib/sane/libsane-dmc.so.1 -usr/lib/sane/libsane-dmc.so.1.0.22 +usr/lib/sane/libsane-dmc.so.1.0.24 #usr/lib/sane/libsane-epjitsu.la usr/lib/sane/libsane-epjitsu.so usr/lib/sane/libsane-epjitsu.so.1 -usr/lib/sane/libsane-epjitsu.so.1.0.22 +usr/lib/sane/libsane-epjitsu.so.1.0.24 #usr/lib/sane/libsane-epson.la usr/lib/sane/libsane-epson.so usr/lib/sane/libsane-epson.so.1 -usr/lib/sane/libsane-epson.so.1.0.22 +usr/lib/sane/libsane-epson.so.1.0.24 #usr/lib/sane/libsane-epson2.la usr/lib/sane/libsane-epson2.so usr/lib/sane/libsane-epson2.so.1 -usr/lib/sane/libsane-epson2.so.1.0.22 +usr/lib/sane/libsane-epson2.so.1.0.24 #usr/lib/sane/libsane-fujitsu.la usr/lib/sane/libsane-fujitsu.so usr/lib/sane/libsane-fujitsu.so.1 -usr/lib/sane/libsane-fujitsu.so.1.0.22 +usr/lib/sane/libsane-fujitsu.so.1.0.24 #usr/lib/sane/libsane-genesys.la usr/lib/sane/libsane-genesys.so usr/lib/sane/libsane-genesys.so.1 -usr/lib/sane/libsane-genesys.so.1.0.22 +usr/lib/sane/libsane-genesys.so.1.0.24 #usr/lib/sane/libsane-gt68xx.la usr/lib/sane/libsane-gt68xx.so usr/lib/sane/libsane-gt68xx.so.1 -usr/lib/sane/libsane-gt68xx.so.1.0.22 +usr/lib/sane/libsane-gt68xx.so.1.0.24 #usr/lib/sane/libsane-hp.la usr/lib/sane/libsane-hp.so usr/lib/sane/libsane-hp.so.1 -usr/lib/sane/libsane-hp.so.1.0.22 +usr/lib/sane/libsane-hp.so.1.0.24 #usr/lib/sane/libsane-hp3500.la usr/lib/sane/libsane-hp3500.so usr/lib/sane/libsane-hp3500.so.1 -usr/lib/sane/libsane-hp3500.so.1.0.22 +usr/lib/sane/libsane-hp3500.so.1.0.24 #usr/lib/sane/libsane-hp3900.la usr/lib/sane/libsane-hp3900.so usr/lib/sane/libsane-hp3900.so.1 -usr/lib/sane/libsane-hp3900.so.1.0.22 +usr/lib/sane/libsane-hp3900.so.1.0.24 #usr/lib/sane/libsane-hp4200.la usr/lib/sane/libsane-hp4200.so usr/lib/sane/libsane-hp4200.so.1 -usr/lib/sane/libsane-hp4200.so.1.0.22 +usr/lib/sane/libsane-hp4200.so.1.0.24 #usr/lib/sane/libsane-hp5400.la usr/lib/sane/libsane-hp5400.so usr/lib/sane/libsane-hp5400.so.1 -usr/lib/sane/libsane-hp5400.so.1.0.22 +usr/lib/sane/libsane-hp5400.so.1.0.24 #usr/lib/sane/libsane-hp5590.la usr/lib/sane/libsane-hp5590.so usr/lib/sane/libsane-hp5590.so.1 -usr/lib/sane/libsane-hp5590.so.1.0.22 +usr/lib/sane/libsane-hp5590.so.1.0.24 #usr/lib/sane/libsane-hpljm1005.la usr/lib/sane/libsane-hpljm1005.so usr/lib/sane/libsane-hpljm1005.so.1 -usr/lib/sane/libsane-hpljm1005.so.1.0.22 +usr/lib/sane/libsane-hpljm1005.so.1.0.24 #usr/lib/sane/libsane-hs2p.la usr/lib/sane/libsane-hs2p.so usr/lib/sane/libsane-hs2p.so.1 -usr/lib/sane/libsane-hs2p.so.1.0.22 +usr/lib/sane/libsane-hs2p.so.1.0.24 #usr/lib/sane/libsane-ibm.la usr/lib/sane/libsane-ibm.so usr/lib/sane/libsane-ibm.so.1 -usr/lib/sane/libsane-ibm.so.1.0.22 +usr/lib/sane/libsane-ibm.so.1.0.24 #usr/lib/sane/libsane-kodak.la usr/lib/sane/libsane-kodak.so usr/lib/sane/libsane-kodak.so.1 -usr/lib/sane/libsane-kodak.so.1.0.22 +usr/lib/sane/libsane-kodak.so.1.0.24 +#usr/lib/sane/libsane-kodakaio.la +usr/lib/sane/libsane-kodakaio.so +usr/lib/sane/libsane-kodakaio.so.1 +usr/lib/sane/libsane-kodakaio.so.1.0.24 #usr/lib/sane/libsane-kvs1025.la usr/lib/sane/libsane-kvs1025.so usr/lib/sane/libsane-kvs1025.so.1 -usr/lib/sane/libsane-kvs1025.so.1.0.22 +usr/lib/sane/libsane-kvs1025.so.1.0.24 #usr/lib/sane/libsane-kvs20xx.la usr/lib/sane/libsane-kvs20xx.so usr/lib/sane/libsane-kvs20xx.so.1 -usr/lib/sane/libsane-kvs20xx.so.1.0.22 +usr/lib/sane/libsane-kvs20xx.so.1.0.24 +#usr/lib/sane/libsane-kvs40xx.la +usr/lib/sane/libsane-kvs40xx.so +usr/lib/sane/libsane-kvs40xx.so.1 +usr/lib/sane/libsane-kvs40xx.so.1.0.24 #usr/lib/sane/libsane-leo.la usr/lib/sane/libsane-leo.so usr/lib/sane/libsane-leo.so.1 -usr/lib/sane/libsane-leo.so.1.0.22 +usr/lib/sane/libsane-leo.so.1.0.24 #usr/lib/sane/libsane-lexmark.la usr/lib/sane/libsane-lexmark.so usr/lib/sane/libsane-lexmark.so.1 -usr/lib/sane/libsane-lexmark.so.1.0.22 +usr/lib/sane/libsane-lexmark.so.1.0.24 #usr/lib/sane/libsane-ma1509.la usr/lib/sane/libsane-ma1509.so usr/lib/sane/libsane-ma1509.so.1 -usr/lib/sane/libsane-ma1509.so.1.0.22 +usr/lib/sane/libsane-ma1509.so.1.0.24 #usr/lib/sane/libsane-magicolor.la usr/lib/sane/libsane-magicolor.so usr/lib/sane/libsane-magicolor.so.1 -usr/lib/sane/libsane-magicolor.so.1.0.22 +usr/lib/sane/libsane-magicolor.so.1.0.24 #usr/lib/sane/libsane-matsushita.la usr/lib/sane/libsane-matsushita.so usr/lib/sane/libsane-matsushita.so.1 -usr/lib/sane/libsane-matsushita.so.1.0.22 +usr/lib/sane/libsane-matsushita.so.1.0.24 #usr/lib/sane/libsane-microtek.la usr/lib/sane/libsane-microtek.so usr/lib/sane/libsane-microtek.so.1 -usr/lib/sane/libsane-microtek.so.1.0.22 +usr/lib/sane/libsane-microtek.so.1.0.24 #usr/lib/sane/libsane-microtek2.la usr/lib/sane/libsane-microtek2.so usr/lib/sane/libsane-microtek2.so.1 -usr/lib/sane/libsane-microtek2.so.1.0.22 +usr/lib/sane/libsane-microtek2.so.1.0.24 #usr/lib/sane/libsane-mustek.la usr/lib/sane/libsane-mustek.so usr/lib/sane/libsane-mustek.so.1 -usr/lib/sane/libsane-mustek.so.1.0.22 +usr/lib/sane/libsane-mustek.so.1.0.24 #usr/lib/sane/libsane-mustek_pp.la usr/lib/sane/libsane-mustek_pp.so usr/lib/sane/libsane-mustek_pp.so.1 -usr/lib/sane/libsane-mustek_pp.so.1.0.22 +usr/lib/sane/libsane-mustek_pp.so.1.0.24 #usr/lib/sane/libsane-mustek_usb.la usr/lib/sane/libsane-mustek_usb.so usr/lib/sane/libsane-mustek_usb.so.1 -usr/lib/sane/libsane-mustek_usb.so.1.0.22 +usr/lib/sane/libsane-mustek_usb.so.1.0.24 +#usr/lib/sane/libsane-mustek_usb2.la +usr/lib/sane/libsane-mustek_usb2.so +usr/lib/sane/libsane-mustek_usb2.so.1 +usr/lib/sane/libsane-mustek_usb2.so.1.0.24 #usr/lib/sane/libsane-nec.la usr/lib/sane/libsane-nec.so usr/lib/sane/libsane-nec.so.1 -usr/lib/sane/libsane-nec.so.1.0.22 +usr/lib/sane/libsane-nec.so.1.0.24 #usr/lib/sane/libsane-net.la usr/lib/sane/libsane-net.so usr/lib/sane/libsane-net.so.1 -usr/lib/sane/libsane-net.so.1.0.22 +usr/lib/sane/libsane-net.so.1.0.24 #usr/lib/sane/libsane-niash.la usr/lib/sane/libsane-niash.so usr/lib/sane/libsane-niash.so.1 -usr/lib/sane/libsane-niash.so.1.0.22 +usr/lib/sane/libsane-niash.so.1.0.24 #usr/lib/sane/libsane-p5.la usr/lib/sane/libsane-p5.so usr/lib/sane/libsane-p5.so.1 -usr/lib/sane/libsane-p5.so.1.0.22 +usr/lib/sane/libsane-p5.so.1.0.24 #usr/lib/sane/libsane-pie.la usr/lib/sane/libsane-pie.so usr/lib/sane/libsane-pie.so.1 -usr/lib/sane/libsane-pie.so.1.0.22 +usr/lib/sane/libsane-pie.so.1.0.24 #usr/lib/sane/libsane-pixma.la usr/lib/sane/libsane-pixma.so usr/lib/sane/libsane-pixma.so.1 -usr/lib/sane/libsane-pixma.so.1.0.22 +usr/lib/sane/libsane-pixma.so.1.0.24 #usr/lib/sane/libsane-plustek.la usr/lib/sane/libsane-plustek.so usr/lib/sane/libsane-plustek.so.1 -usr/lib/sane/libsane-plustek.so.1.0.22 +usr/lib/sane/libsane-plustek.so.1.0.24 #usr/lib/sane/libsane-plustek_pp.la usr/lib/sane/libsane-plustek_pp.so usr/lib/sane/libsane-plustek_pp.so.1 -usr/lib/sane/libsane-plustek_pp.so.1.0.22 +usr/lib/sane/libsane-plustek_pp.so.1.0.24 #usr/lib/sane/libsane-qcam.la usr/lib/sane/libsane-qcam.so usr/lib/sane/libsane-qcam.so.1 -usr/lib/sane/libsane-qcam.so.1.0.22 +usr/lib/sane/libsane-qcam.so.1.0.24 #usr/lib/sane/libsane-ricoh.la usr/lib/sane/libsane-ricoh.so usr/lib/sane/libsane-ricoh.so.1 -usr/lib/sane/libsane-ricoh.so.1.0.22 +usr/lib/sane/libsane-ricoh.so.1.0.24 #usr/lib/sane/libsane-rts8891.la usr/lib/sane/libsane-rts8891.so usr/lib/sane/libsane-rts8891.so.1 -usr/lib/sane/libsane-rts8891.so.1.0.22 +usr/lib/sane/libsane-rts8891.so.1.0.24 #usr/lib/sane/libsane-s9036.la usr/lib/sane/libsane-s9036.so usr/lib/sane/libsane-s9036.so.1 -usr/lib/sane/libsane-s9036.so.1.0.22 +usr/lib/sane/libsane-s9036.so.1.0.24 #usr/lib/sane/libsane-sceptre.la usr/lib/sane/libsane-sceptre.so usr/lib/sane/libsane-sceptre.so.1 -usr/lib/sane/libsane-sceptre.so.1.0.22 +usr/lib/sane/libsane-sceptre.so.1.0.24 #usr/lib/sane/libsane-sharp.la usr/lib/sane/libsane-sharp.so usr/lib/sane/libsane-sharp.so.1 -usr/lib/sane/libsane-sharp.so.1.0.22 +usr/lib/sane/libsane-sharp.so.1.0.24 #usr/lib/sane/libsane-sm3600.la usr/lib/sane/libsane-sm3600.so usr/lib/sane/libsane-sm3600.so.1 -usr/lib/sane/libsane-sm3600.so.1.0.22 +usr/lib/sane/libsane-sm3600.so.1.0.24 #usr/lib/sane/libsane-sm3840.la usr/lib/sane/libsane-sm3840.so usr/lib/sane/libsane-sm3840.so.1 -usr/lib/sane/libsane-sm3840.so.1.0.22 +usr/lib/sane/libsane-sm3840.so.1.0.24 #usr/lib/sane/libsane-snapscan.la usr/lib/sane/libsane-snapscan.so usr/lib/sane/libsane-snapscan.so.1 -usr/lib/sane/libsane-snapscan.so.1.0.22 +usr/lib/sane/libsane-snapscan.so.1.0.24 #usr/lib/sane/libsane-sp15c.la usr/lib/sane/libsane-sp15c.so usr/lib/sane/libsane-sp15c.so.1 -usr/lib/sane/libsane-sp15c.so.1.0.22 +usr/lib/sane/libsane-sp15c.so.1.0.24 #usr/lib/sane/libsane-st400.la usr/lib/sane/libsane-st400.so usr/lib/sane/libsane-st400.so.1 -usr/lib/sane/libsane-st400.so.1.0.22 +usr/lib/sane/libsane-st400.so.1.0.24 #usr/lib/sane/libsane-stv680.la usr/lib/sane/libsane-stv680.so usr/lib/sane/libsane-stv680.so.1 -usr/lib/sane/libsane-stv680.so.1.0.22 +usr/lib/sane/libsane-stv680.so.1.0.24 #usr/lib/sane/libsane-tamarack.la usr/lib/sane/libsane-tamarack.so usr/lib/sane/libsane-tamarack.so.1 -usr/lib/sane/libsane-tamarack.so.1.0.22 +usr/lib/sane/libsane-tamarack.so.1.0.24 #usr/lib/sane/libsane-teco1.la usr/lib/sane/libsane-teco1.so usr/lib/sane/libsane-teco1.so.1 -usr/lib/sane/libsane-teco1.so.1.0.22 +usr/lib/sane/libsane-teco1.so.1.0.24 #usr/lib/sane/libsane-teco2.la usr/lib/sane/libsane-teco2.so usr/lib/sane/libsane-teco2.so.1 -usr/lib/sane/libsane-teco2.so.1.0.22 +usr/lib/sane/libsane-teco2.so.1.0.24 #usr/lib/sane/libsane-teco3.la usr/lib/sane/libsane-teco3.so usr/lib/sane/libsane-teco3.so.1 -usr/lib/sane/libsane-teco3.so.1.0.22 +usr/lib/sane/libsane-teco3.so.1.0.24 #usr/lib/sane/libsane-test.la usr/lib/sane/libsane-test.so usr/lib/sane/libsane-test.so.1 -usr/lib/sane/libsane-test.so.1.0.22 +usr/lib/sane/libsane-test.so.1.0.24 #usr/lib/sane/libsane-u12.la usr/lib/sane/libsane-u12.so usr/lib/sane/libsane-u12.so.1 -usr/lib/sane/libsane-u12.so.1.0.22 +usr/lib/sane/libsane-u12.so.1.0.24 #usr/lib/sane/libsane-umax.la usr/lib/sane/libsane-umax.so usr/lib/sane/libsane-umax.so.1 -usr/lib/sane/libsane-umax.so.1.0.22 +usr/lib/sane/libsane-umax.so.1.0.24 #usr/lib/sane/libsane-umax1220u.la usr/lib/sane/libsane-umax1220u.so usr/lib/sane/libsane-umax1220u.so.1 -usr/lib/sane/libsane-umax1220u.so.1.0.22 +usr/lib/sane/libsane-umax1220u.so.1.0.24 #usr/lib/sane/libsane-umax_pp.la usr/lib/sane/libsane-umax_pp.so usr/lib/sane/libsane-umax_pp.so.1 -usr/lib/sane/libsane-umax_pp.so.1.0.22 +usr/lib/sane/libsane-umax_pp.so.1.0.24 #usr/lib/sane/libsane-xerox_mfp.la usr/lib/sane/libsane-xerox_mfp.so usr/lib/sane/libsane-xerox_mfp.so.1 -usr/lib/sane/libsane-xerox_mfp.so.1.0.22 +usr/lib/sane/libsane-xerox_mfp.so.1.0.24 usr/sbin/saned #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo @@ -560,8 +574,10 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo #usr/share/man/man5/sane-hs2p.5 #usr/share/man/man5/sane-ibm.5 #usr/share/man/man5/sane-kodak.5 +#usr/share/man/man5/sane-kodakaio.5 #usr/share/man/man5/sane-kvs1025.5 #usr/share/man/man5/sane-kvs20xx.5 +#usr/share/man/man5/sane-kvs40xx.5 #usr/share/man/man5/sane-leo.5 #usr/share/man/man5/sane-lexmark.5 #usr/share/man/man5/sane-ma1509.5 @@ -572,6 +588,7 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo #usr/share/man/man5/sane-mustek.5 #usr/share/man/man5/sane-mustek_pp.5 #usr/share/man/man5/sane-mustek_usb.5 +#usr/share/man/man5/sane-mustek_usb2.5 #usr/share/man/man5/sane-nec.5 #usr/share/man/man5/sane-net.5 #usr/share/man/man5/sane-niash.5 @@ -611,7 +628,6 @@ usr/share/sane/artec_eplus48u usr/share/sane/epjitsu usr/share/sane/gt68xx usr/share/sane/snapscan -#usr/var #usr/var/lock usr/var/lock/sane var/ipfire/backup/addons/includes/sane diff --git a/lfs/sane b/lfs/sane index 96341b6..842b548 100644 --- a/lfs/sane +++ b/lfs/sane @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.0.22 +VER = 1.0.24 THISAPP = sane-$(VER) DL_FILE = sane-backends-$(VER).tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/sane-backends-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sane -PAK_VER = 2 +PAK_VER = 3 DEPS = "libtiff" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5 +$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4 install : $(TARGET) diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch new file mode 100644 index 0000000..e2e34a1 --- /dev/null +++ b/src/patches/net-tools-1.60-no-hostname.patch @@ -0,0 +1,52 @@ +--- a/Makefile.bak 2014-06-03 19:01:39.758845492 +0000 ++++ b/Makefile 2014-06-03 19:02:34.119171419 +0000 +@@ -76,7 +76,7 @@ + NET_LIB_PATH = lib + NET_LIB_NAME = net-tools + +-PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif ++PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif + + -include config.make + ifeq ($(HAVE_IP_TOOLS),1) +@@ -190,9 +190,6 @@ + nameif: nameif.o + $(CC) $(LDFLAGS) -o nameif nameif.o + +-hostname: hostname.o +- $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB) +- + route: $(NET_LIB) route.o + $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB) + +@@ -224,7 +221,6 @@ + install -m 0755 -d ${BASEDIR}/sbin + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin +- install -m 0755 hostname ${BASEDIR}/bin + install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin +@@ -239,21 +235,11 @@ + ifeq ($(HAVE_MII),1) + install -m 0755 mii-tool $(BASEDIR)/sbin + endif +- ln -fs hostname $(BASEDIR)/bin/dnsdomainname +- ln -fs hostname $(BASEDIR)/bin/ypdomainname +- ln -fs hostname $(BASEDIR)/bin/nisdomainname +- ln -fs hostname $(BASEDIR)/bin/domainname +-ifeq ($(HAVE_AFDECnet),1) +- ln -fs hostname $(BASEDIR)/bin/nodename +-endif + + savebin: + @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ + ${BASEDIR}/bin/netstat \ +- ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ +- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ +- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ +- ${BASEDIR}/bin/domainname ; do \ ++ ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \ + [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. + + installdata: hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core78, updated. 34a5f039399d782e090be2fa42604de9380ccaec
by git＠ipfire.org 05 Jun '14

05 Jun '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e3b309978704e66a4c9bb616ccf25d069ed159aa
by git＠ipfire.org 04 Jun '14

04 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via e3b309978704e66a4c9bb616ccf25d069ed159aa (commit) from 602e26a56529ab13a041a2b3e535655a122edff4 (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 e3b309978704e66a4c9bb616ccf25d069ed159aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 5 00:50:08 2014 +0200 net-tools: Commit missing patch file. ----------------------------------------------------------------------- Summary of changes: src/patches/net-tools-1.60-no-hostname.patch | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/patches/net-tools-1.60-no-hostname.patch Difference in files: diff --git a/src/patches/net-tools-1.60-no-hostname.patch b/src/patches/net-tools-1.60-no-hostname.patch new file mode 100644 index 0000000..e2e34a1 --- /dev/null +++ b/src/patches/net-tools-1.60-no-hostname.patch @@ -0,0 +1,52 @@ +--- a/Makefile.bak 2014-06-03 19:01:39.758845492 +0000 ++++ b/Makefile 2014-06-03 19:02:34.119171419 +0000 +@@ -76,7 +76,7 @@ + NET_LIB_PATH = lib + NET_LIB_NAME = net-tools + +-PROGS := ifconfig hostname arp netstat route rarp slattach plipconfig nameif ++PROGS := ifconfig arp netstat route rarp slattach plipconfig nameif + + -include config.make + ifeq ($(HAVE_IP_TOOLS),1) +@@ -190,9 +190,6 @@ + nameif: nameif.o + $(CC) $(LDFLAGS) -o nameif nameif.o + +-hostname: hostname.o +- $(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB) +- + route: $(NET_LIB) route.o + $(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB) + +@@ -224,7 +221,6 @@ + install -m 0755 -d ${BASEDIR}/sbin + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin +- install -m 0755 hostname ${BASEDIR}/bin + install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin +@@ -239,21 +235,11 @@ + ifeq ($(HAVE_MII),1) + install -m 0755 mii-tool $(BASEDIR)/sbin + endif +- ln -fs hostname $(BASEDIR)/bin/dnsdomainname +- ln -fs hostname $(BASEDIR)/bin/ypdomainname +- ln -fs hostname $(BASEDIR)/bin/nisdomainname +- ln -fs hostname $(BASEDIR)/bin/domainname +-ifeq ($(HAVE_AFDECnet),1) +- ln -fs hostname $(BASEDIR)/bin/nodename +-endif + + savebin: + @for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \ + ${BASEDIR}/bin/netstat \ +- ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \ +- ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \ +- ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \ +- ${BASEDIR}/bin/domainname ; do \ ++ ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route; do \ + [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved. + + installdata: hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core78, updated. 43ea947fb413125d577225f81c138b449c7247f1
by git＠ipfire.org 04 Jun '14

04 Jun '14

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, core78 has been updated via 43ea947fb413125d577225f81c138b449c7247f1 (commit) via 602e26a56529ab13a041a2b3e535655a122edff4 (commit) via 6a27e0b06ab907e852b6b87eaf83927439f06b7d (commit) via ad59362fc738803014b35c22f12ba32b72010bd8 (commit) via ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 (commit) via f4e9a251168732fb30358402a5d5ca1b4b572698 (commit) via e0d208c5f4ea8a33b0c9bfe221090a0c961de82d (commit) via 1efa8995ebe9bb911d6575b6587c0600187572ae (commit) via a545f88e402a62d1b90a929b0e6622ae6eeeb143 (commit) from eab3759a854442a3846548c9bae62539764796c0 (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 43ea947fb413125d577225f81c138b449c7247f1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 4 19:55:59 2014 +0200 core78: add more changed files to updater. ----------------------------------------------------------------------- Summary of changes: config/etc/group | 2 +- config/rootfiles/common/hostname | 9 +++ config/rootfiles/common/net-tools | 9 --- config/rootfiles/core/78/filelists/files | 3 + config/rootfiles/core/78/filelists/hostname | 1 + .../rootfiles/core/78/filelists/perl-Device-Modem | 1 + .../core/78/filelists/perl-Device-SerialPort | 1 + config/rootfiles/core/78/update.sh | 3 + config/rootfiles/packages/icinga | 2 +- lfs/{arping => hostname} | 11 ++-- lfs/net-tools | 1 + lfs/squidclamav | 4 +- lfs/transmission | 8 +-- make.sh | 1 + src/patches/hostname-rh.patch | 69 ++++++++++++++++++++++ .../squidclamav-5.11-squid-helper-protocol.patch | 10 ++-- 16 files changed, 108 insertions(+), 27 deletions(-) create mode 100644 config/rootfiles/common/hostname create mode 120000 config/rootfiles/core/78/filelists/hostname create mode 120000 config/rootfiles/core/78/filelists/perl-Device-Modem create mode 120000 config/rootfiles/core/78/filelists/perl-Device-SerialPort copy lfs/{arping => hostname} (92%) create mode 100644 src/patches/hostname-rh.patch Difference in files: diff --git a/config/etc/group b/config/etc/group index 46e4b80..ab5f4af 100644 --- a/config/etc/group +++ b/config/etc/group @@ -10,7 +10,7 @@ kmem:x:9: wheel:x:10:root mail:x:12:mail uucp:x:14: -dialout:x:16: +dialout:x:16:nobody floppy:x:19: tape:x:20: utmp:x:22: diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname new file mode 100644 index 0000000..7c59b98 --- /dev/null +++ b/config/rootfiles/common/hostname @@ -0,0 +1,9 @@ +bin/dnsdomainname +bin/domainname +bin/hostname +bin/nisdomainname +bin/ypdomainname +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 3cf72ac..4860b2f 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,9 +1,4 @@ -bin/dnsdomainname -bin/domainname -bin/hostname bin/netstat -#bin/nisdomainname -#bin/ypdomainname sbin/arp sbin/ifconfig #sbin/ipmaddr @@ -14,10 +9,6 @@ sbin/nameif sbin/rarp sbin/route sbin/slattach -#usr/share/man/man1/dnsdomainname.1 -#usr/share/man/man1/domainname.1 -#usr/share/man/man1/nisdomainname.1 -#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index 851ce36..c0fa689 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -7,12 +7,15 @@ srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/modem-status.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/bin/squidGuard +usr/sbin/firewall_policy usr/sbin/redirect_wrapper usr/sbin/updxlrator usr/local/bin/setddns.pl +var/ipfire/header.pl var/ipfire/langs var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/78/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/perl-Device-Modem b/config/rootfiles/core/78/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/perl-Device-SerialPort b/config/rootfiles/core/78/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh index 6564379..f3e0593 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/core/78/update.sh @@ -173,6 +173,9 @@ chmod 4755 /usr/bin/ping # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Add nobody to group dialout +usermod -a -G dialout nobody + # # Start services # diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga index caddac3..7a8ae92 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -20,7 +20,7 @@ etc/rc.d/init.d/icinga etc/rc.d/rc0.d/K33icinga etc/rc.d/rc3.d/S67icinga etc/rc.d/rc6.d/K33icinga -#usr/bin/icinga +usr/bin/icinga usr/bin/icingastats #usr/lib/icinga usr/lib/icinga/p1.pl diff --git a/lfs/hostname b/lfs/hostname new file mode 100644 index 0000000..feac3a0 --- /dev/null +++ b/lfs/hostname @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 = 3.15 + +THISAPP = hostname_$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/hostname +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563 + +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) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install BINDIR=/bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/net-tools b/lfs/net-tools index 08b4815..ae4d738 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch diff --git a/lfs/squidclamav b/lfs/squidclamav index 263826f..697b59a 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 18 +PAK_VER = 19 DEPS = "clamav" diff --git a/lfs/transmission b/lfs/transmission index 51c2fbd..cb4ad45 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.82 +VER = 2.83 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 = 9 +PAK_VER = 10 DEPS = "libevent2" @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661 +$(DL_FILE)_MD5 = 4620cfbfefee2ce55a6fa12c3ec330a7 install : $(TARGET) diff --git a/make.sh b/make.sh index 041a0f6..c170076 100755 --- a/make.sh +++ b/make.sh @@ -355,6 +355,7 @@ buildbase() { lfsmake2 groff lfsmake2 gperf lfsmake2 gzip + lfsmake2 hostname lfsmake2 iproute2 lfsmake2 jwhois lfsmake2 kbd diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch new file mode 100644 index 0000000..d56ae59 --- /dev/null +++ b/src/patches/hostname-rh.patch @@ -0,0 +1,69 @@ +diff -up hostname/Makefile.rh hostname/Makefile +--- hostname/Makefile.rh 2013-11-04 10:12:59.670379153 +0100 ++++ hostname/Makefile 2013-11-04 10:15:04.957314495 +0100 +@@ -10,21 +10,17 @@ OBJS=hostname.o + + hostname: $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl +- ln -fs hostname dnsdomainname +- ln -fs hostname domainname +- ln -fs hostname ypdomainname +- ln -fs hostname nisdomainname + + install: hostname + install -d ${BASEDIR}$(MANDIR)/man1 +- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 ++ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1 + + install -d ${BASEDIR}$(BINDIR) +- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR) ++ install -m 0755 hostname ${BASEDIR}$(BINDIR) + ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname + ln -fs hostname ${BASEDIR}$(BINDIR)/domainname + ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname +diff -up hostname/hostname.1.rh hostname/hostname.1 +--- hostname/hostname.1.rh 2013-11-03 15:24:23.000000000 +0100 ++++ hostname/hostname.1 2013-11-04 10:12:59.670379153 +0100 +@@ -80,6 +80,28 @@ complete FQDN of the system is returned + .B "THE FQDN" + below). + ++.LP ++The function ++.BR gethostname(2) ++is used to get the hostname. When the ++.BR "hostname \-a, \-d, \-f or \-i" ++is called will ++.BR gethostbyname(3) ++be called. The difference in ++.BR gethostname(2) ++and ++.BR gethostbyname(3) ++is that ++.BR gethostbyname(3) ++is network aware, so it consults ++.IR /etc/nsswitch.conf ++and ++.IR /etc/host.conf ++to decide whether to read information in ++.IR /etc/hostname ++or ++.IR /etc/hosts ++ + .SS "SET NAME" + When called with one argument or with the + .B \-\-file +@@ -105,8 +127,7 @@ command (see + .B "THE FQDN" + below). + .LP +-The host name is usually set once at system startup in +-.I /etc/init.d/hostname.sh ++The host name is usually set once at system startup + (normally by reading the contents of a file which contains + the host name, e.g. + .IR /etc/hostname ). diff --git a/src/patches/squidclamav-5.11-squid-helper-protocol.patch b/src/patches/squidclamav-5.11-squid-helper-protocol.patch index 0bdb21b..e64bcaf 100644 --- a/src/patches/squidclamav-5.11-squid-helper-protocol.patch +++ b/src/patches/squidclamav-5.11-squid-helper-protocol.patch @@ -1,6 +1,6 @@ -diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidclamav.c ---- squidclamav-5.11-vanilla/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 -+++ squidclamav-5.11/src/squidclamav.c 2014-06-02 15:19:05.463465297 +0200 +diff -Naur squidclamav-5.11.org/src/squidclamav.c squidclamav-5.11/src/squidclamav.c +--- squidclamav-5.11.org/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 ++++ squidclamav-5.11/src/squidclamav.c 2014-06-03 12:26:36.215696508 +0200 @@ -483,7 +483,7 @@ aren't appropriate, then just echo back the line from stdin */ if (buff_status == 1) { @@ -61,7 +61,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0) @@ -170,7 +170,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 602e26a56529ab13a041a2b3e535655a122edff4
by git＠ipfire.org 04 Jun '14

04 Jun '14

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 602e26a56529ab13a041a2b3e535655a122edff4 (commit) via 6a27e0b06ab907e852b6b87eaf83927439f06b7d (commit) via ad59362fc738803014b35c22f12ba32b72010bd8 (commit) via ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 (commit) via f4e9a251168732fb30358402a5d5ca1b4b572698 (commit) via e0d208c5f4ea8a33b0c9bfe221090a0c961de82d (commit) via 1efa8995ebe9bb911d6575b6587c0600187572ae (commit) via a545f88e402a62d1b90a929b0e6622ae6eeeb143 (commit) via eab3759a854442a3846548c9bae62539764796c0 (commit) via 3e611b5e0301de8858cddaa9b9a9d3f8a95f4a39 (commit) via 4eb368f153e1e211680aa146c2e17fb63992ea49 (commit) via 69a324f0bb14e65c9e0a6b24b3bd9db8b57ff3b5 (commit) via f7fb5bc5c9b5831729669c35cd9a934f516db471 (commit) via 92bed25016aa2f4054723e4d607680a3354d8d96 (commit) via fc5dd098c2c70d76ca6f3b35576bd8b062afde71 (commit) via 520fd2431bfccddd30489653ba9024f2d214205a (commit) from ccf1cb25b969b216db241c59b8ec4cbe12da66bf (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 602e26a56529ab13a041a2b3e535655a122edff4 Merge: 6a27e0b e0d208c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 12:03:09 2014 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit 6a27e0b06ab907e852b6b87eaf83927439f06b7d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 10:14:21 2014 +0200 icinga: Rootfile update. commit ad59362fc738803014b35c22f12ba32b72010bd8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 05:39:05 2014 +0200 hostname: Add rootfile. commit ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 21:06:30 2014 +0200 net-tools: Don't build hostname. commit f4e9a251168732fb30358402a5d5ca1b4b572698 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 20:57:30 2014 +0200 hostname: New package. commit e0d208c5f4ea8a33b0c9bfe221090a0c961de82d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 3 18:20:27 2014 +0200 transmission: update to 2.83. commit 1efa8995ebe9bb911d6575b6587c0600187572ae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 15:32:00 2014 +0200 Add user nobody to group dialout. Those permissions are required for modem-status.cgi to communicate with serial modems. commit a545f88e402a62d1b90a929b0e6622ae6eeeb143 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 3 12:29:23 2014 +0200 squidclamav: fix warning page delivery. The page reside on the ipfire not on the clients so only rewrite-url can used. ----------------------------------------------------------------------- Summary of changes: config/etc/group | 2 +- config/rootfiles/common/armv5tel/util-linux | 1 + config/rootfiles/common/hostname | 9 +++ config/rootfiles/common/i586/util-linux | 2 +- config/rootfiles/common/net-tools | 9 --- config/rootfiles/core/78/filelists/hostname | 1 + config/rootfiles/core/78/filelists/sudo | 1 + config/rootfiles/core/78/update.sh | 3 + config/rootfiles/packages/icinga | 3 +- config/rootfiles/packages/nagios | 2 + config/rootfiles/packages/tftpd | 4 +- lfs/{arping => hostname} | 11 ++-- lfs/net-tools | 1 + lfs/squidclamav | 4 +- lfs/transmission | 8 +-- make.sh | 1 + src/patches/hostname-rh.patch | 69 ++++++++++++++++++++++ .../squidclamav-5.11-squid-helper-protocol.patch | 10 ++-- 18 files changed, 111 insertions(+), 30 deletions(-) create mode 100644 config/rootfiles/common/hostname create mode 120000 config/rootfiles/core/78/filelists/hostname create mode 120000 config/rootfiles/core/78/filelists/sudo copy lfs/{arping => hostname} (92%) create mode 100644 src/patches/hostname-rh.patch Difference in files: diff --git a/config/etc/group b/config/etc/group index 46e4b80..ab5f4af 100644 --- a/config/etc/group +++ b/config/etc/group @@ -10,7 +10,7 @@ kmem:x:9: wheel:x:10:root mail:x:12:mail uucp:x:14: -dialout:x:16: +dialout:x:16:nobody floppy:x:19: tape:x:20: utmp:x:22: diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 85b027d..c75b147 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -233,6 +233,7 @@ usr/sbin/rtcwake #usr/share/man/man1/ipcmk.1 #usr/share/man/man1/ipcrm.1 #usr/share/man/man1/ipcs.1 +#usr/share/man/man1/logger.1 #usr/share/man/man1/look.1 #usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname new file mode 100644 index 0000000..7c59b98 --- /dev/null +++ b/config/rootfiles/common/hostname @@ -0,0 +1,9 @@ +bin/dnsdomainname +bin/domainname +bin/hostname +bin/nisdomainname +bin/ypdomainname +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index ea3de18..6f31cf6 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -234,6 +234,7 @@ usr/share/bash-completion #usr/share/man/man1/ipcmk.1 #usr/share/man/man1/ipcrm.1 #usr/share/man/man1/ipcs.1 +#usr/share/man/man1/logger.1 #usr/share/man/man1/look.1 #usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 @@ -303,4 +304,3 @@ usr/share/bash-completion #usr/share/man/man8/umount.8 #usr/share/man/man8/wdctl.8 #usr/share/man/man8/wipefs.8 - diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 3cf72ac..4860b2f 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,9 +1,4 @@ -bin/dnsdomainname -bin/domainname -bin/hostname bin/netstat -#bin/nisdomainname -#bin/ypdomainname sbin/arp sbin/ifconfig #sbin/ipmaddr @@ -14,10 +9,6 @@ sbin/nameif sbin/rarp sbin/route sbin/slattach -#usr/share/man/man1/dnsdomainname.1 -#usr/share/man/man1/domainname.1 -#usr/share/man/man1/nisdomainname.1 -#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/78/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/sudo b/config/rootfiles/core/78/filelists/sudo new file mode 120000 index 0000000..0d3c45e --- /dev/null +++ b/config/rootfiles/core/78/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh index 6564379..f3e0593 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/core/78/update.sh @@ -173,6 +173,9 @@ chmod 4755 /usr/bin/ping # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Add nobody to group dialout +usermod -a -G dialout nobody + # # Start services # diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga index e31b73a..7a8ae92 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -20,8 +20,9 @@ etc/rc.d/init.d/icinga etc/rc.d/rc0.d/K33icinga etc/rc.d/rc3.d/S67icinga etc/rc.d/rc6.d/K33icinga -#usr/bin/icinga +usr/bin/icinga usr/bin/icingastats +#usr/lib/icinga usr/lib/icinga/p1.pl #usr/lib/icinga/plugins usr/lib/icinga/plugins/check_apt diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios index f0200cb..971a360 100644 --- a/config/rootfiles/packages/nagios +++ b/config/rootfiles/packages/nagios @@ -34,6 +34,7 @@ usr/lib/nagios #usr/lib/nagios/check_file_age #usr/lib/nagios/check_flexlm #usr/lib/nagios/check_ftp +#usr/lib/nagios/check_hpjd #usr/lib/nagios/check_http #usr/lib/nagios/check_icmp #usr/lib/nagios/check_ide_smart @@ -69,6 +70,7 @@ usr/lib/nagios #usr/lib/nagios/check_sensors #usr/lib/nagios/check_simap #usr/lib/nagios/check_smtp +#usr/lib/nagios/check_snmp #usr/lib/nagios/check_spop #usr/lib/nagios/check_ssh #usr/lib/nagios/check_ssmtp diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd index 55d261b..eb19657 100644 --- a/config/rootfiles/packages/tftpd +++ b/config/rootfiles/packages/tftpd @@ -1,6 +1,6 @@ -etc/rc.d/init.d/tftpd +usr/bin/tftp #usr/man/man1/tftp.1 #usr/man/man8/in.tftpd.8 #usr/man/man8/tftpd.8 usr/sbin/tftpd -#var/tftpboot +etc/rc.d/init.d/tftpd diff --git a/lfs/hostname b/lfs/hostname new file mode 100644 index 0000000..feac3a0 --- /dev/null +++ b/lfs/hostname @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 = 3.15 + +THISAPP = hostname_$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/hostname +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563 + +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) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install BINDIR=/bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/net-tools b/lfs/net-tools index 08b4815..ae4d738 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch diff --git a/lfs/squidclamav b/lfs/squidclamav index 263826f..697b59a 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 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 # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 18 +PAK_VER = 19 DEPS = "clamav" diff --git a/lfs/transmission b/lfs/transmission index 51c2fbd..cb4ad45 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.82 +VER = 2.83 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 = 9 +PAK_VER = 10 DEPS = "libevent2" @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661 +$(DL_FILE)_MD5 = 4620cfbfefee2ce55a6fa12c3ec330a7 install : $(TARGET) diff --git a/make.sh b/make.sh index 041a0f6..c170076 100755 --- a/make.sh +++ b/make.sh @@ -355,6 +355,7 @@ buildbase() { lfsmake2 groff lfsmake2 gperf lfsmake2 gzip + lfsmake2 hostname lfsmake2 iproute2 lfsmake2 jwhois lfsmake2 kbd diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch new file mode 100644 index 0000000..d56ae59 --- /dev/null +++ b/src/patches/hostname-rh.patch @@ -0,0 +1,69 @@ +diff -up hostname/Makefile.rh hostname/Makefile +--- hostname/Makefile.rh 2013-11-04 10:12:59.670379153 +0100 ++++ hostname/Makefile 2013-11-04 10:15:04.957314495 +0100 +@@ -10,21 +10,17 @@ OBJS=hostname.o + + hostname: $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl +- ln -fs hostname dnsdomainname +- ln -fs hostname domainname +- ln -fs hostname ypdomainname +- ln -fs hostname nisdomainname + + install: hostname + install -d ${BASEDIR}$(MANDIR)/man1 +- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 ++ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1 + + install -d ${BASEDIR}$(BINDIR) +- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR) ++ install -m 0755 hostname ${BASEDIR}$(BINDIR) + ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname + ln -fs hostname ${BASEDIR}$(BINDIR)/domainname + ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname +diff -up hostname/hostname.1.rh hostname/hostname.1 +--- hostname/hostname.1.rh 2013-11-03 15:24:23.000000000 +0100 ++++ hostname/hostname.1 2013-11-04 10:12:59.670379153 +0100 +@@ -80,6 +80,28 @@ complete FQDN of the system is returned + .B "THE FQDN" + below). + ++.LP ++The function ++.BR gethostname(2) ++is used to get the hostname. When the ++.BR "hostname \-a, \-d, \-f or \-i" ++is called will ++.BR gethostbyname(3) ++be called. The difference in ++.BR gethostname(2) ++and ++.BR gethostbyname(3) ++is that ++.BR gethostbyname(3) ++is network aware, so it consults ++.IR /etc/nsswitch.conf ++and ++.IR /etc/host.conf ++to decide whether to read information in ++.IR /etc/hostname ++or ++.IR /etc/hosts ++ + .SS "SET NAME" + When called with one argument or with the + .B \-\-file +@@ -105,8 +127,7 @@ command (see + .B "THE FQDN" + below). + .LP +-The host name is usually set once at system startup in +-.I /etc/init.d/hostname.sh ++The host name is usually set once at system startup + (normally by reading the contents of a file which contains + the host name, e.g. + .IR /etc/hostname ). diff --git a/src/patches/squidclamav-5.11-squid-helper-protocol.patch b/src/patches/squidclamav-5.11-squid-helper-protocol.patch index 0bdb21b..e64bcaf 100644 --- a/src/patches/squidclamav-5.11-squid-helper-protocol.patch +++ b/src/patches/squidclamav-5.11-squid-helper-protocol.patch @@ -1,6 +1,6 @@ -diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidclamav.c ---- squidclamav-5.11-vanilla/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 -+++ squidclamav-5.11/src/squidclamav.c 2014-06-02 15:19:05.463465297 +0200 +diff -Naur squidclamav-5.11.org/src/squidclamav.c squidclamav-5.11/src/squidclamav.c +--- squidclamav-5.11.org/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 ++++ squidclamav-5.11/src/squidclamav.c 2014-06-03 12:26:36.215696508 +0200 @@ -483,7 +483,7 @@ aren't appropriate, then just echo back the line from stdin */ if (buff_status == 1) { @@ -61,7 +61,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0) @@ -170,7 +170,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 602e26a56529ab13a041a2b3e535655a122edff4
by git＠ipfire.org 04 Jun '14

04 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 602e26a56529ab13a041a2b3e535655a122edff4 (commit) via 6a27e0b06ab907e852b6b87eaf83927439f06b7d (commit) via ad59362fc738803014b35c22f12ba32b72010bd8 (commit) via ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 (commit) via f4e9a251168732fb30358402a5d5ca1b4b572698 (commit) via 1efa8995ebe9bb911d6575b6587c0600187572ae (commit) from e0d208c5f4ea8a33b0c9bfe221090a0c961de82d (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 602e26a56529ab13a041a2b3e535655a122edff4 Merge: 6a27e0b e0d208c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 12:03:09 2014 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit 6a27e0b06ab907e852b6b87eaf83927439f06b7d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 10:14:21 2014 +0200 icinga: Rootfile update. commit ad59362fc738803014b35c22f12ba32b72010bd8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 4 05:39:05 2014 +0200 hostname: Add rootfile. commit ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 21:06:30 2014 +0200 net-tools: Don't build hostname. commit f4e9a251168732fb30358402a5d5ca1b4b572698 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 20:57:30 2014 +0200 hostname: New package. commit 1efa8995ebe9bb911d6575b6587c0600187572ae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 3 15:32:00 2014 +0200 Add user nobody to group dialout. Those permissions are required for modem-status.cgi to communicate with serial modems. ----------------------------------------------------------------------- Summary of changes: config/etc/group | 2 +- config/rootfiles/common/hostname | 9 ++++ config/rootfiles/common/net-tools | 9 ---- config/rootfiles/core/78/filelists/hostname | 1 + config/rootfiles/core/78/update.sh | 3 ++ config/rootfiles/packages/icinga | 2 +- lfs/{arping => hostname} | 11 ++--- lfs/net-tools | 1 + make.sh | 1 + src/patches/hostname-rh.patch | 69 +++++++++++++++++++++++++++++ 10 files changed, 92 insertions(+), 16 deletions(-) create mode 100644 config/rootfiles/common/hostname create mode 120000 config/rootfiles/core/78/filelists/hostname copy lfs/{arping => hostname} (92%) create mode 100644 src/patches/hostname-rh.patch Difference in files: diff --git a/config/etc/group b/config/etc/group index 46e4b80..ab5f4af 100644 --- a/config/etc/group +++ b/config/etc/group @@ -10,7 +10,7 @@ kmem:x:9: wheel:x:10:root mail:x:12:mail uucp:x:14: -dialout:x:16: +dialout:x:16:nobody floppy:x:19: tape:x:20: utmp:x:22: diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname new file mode 100644 index 0000000..7c59b98 --- /dev/null +++ b/config/rootfiles/common/hostname @@ -0,0 +1,9 @@ +bin/dnsdomainname +bin/domainname +bin/hostname +bin/nisdomainname +bin/ypdomainname +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 3cf72ac..4860b2f 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,9 +1,4 @@ -bin/dnsdomainname -bin/domainname -bin/hostname bin/netstat -#bin/nisdomainname -#bin/ypdomainname sbin/arp sbin/ifconfig #sbin/ipmaddr @@ -14,10 +9,6 @@ sbin/nameif sbin/rarp sbin/route sbin/slattach -#usr/share/man/man1/dnsdomainname.1 -#usr/share/man/man1/domainname.1 -#usr/share/man/man1/nisdomainname.1 -#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/78/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh index 6564379..f3e0593 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/core/78/update.sh @@ -173,6 +173,9 @@ chmod 4755 /usr/bin/ping # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Add nobody to group dialout +usermod -a -G dialout nobody + # # Start services # diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga index caddac3..7a8ae92 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -20,7 +20,7 @@ etc/rc.d/init.d/icinga etc/rc.d/rc0.d/K33icinga etc/rc.d/rc3.d/S67icinga etc/rc.d/rc6.d/K33icinga -#usr/bin/icinga +usr/bin/icinga usr/bin/icingastats #usr/lib/icinga usr/lib/icinga/p1.pl diff --git a/lfs/hostname b/lfs/hostname new file mode 100644 index 0000000..feac3a0 --- /dev/null +++ b/lfs/hostname @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 = 3.15 + +THISAPP = hostname_$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/hostname +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563 + +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) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install BINDIR=/bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/net-tools b/lfs/net-tools index 08b4815..ae4d738 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch diff --git a/make.sh b/make.sh index 041a0f6..c170076 100755 --- a/make.sh +++ b/make.sh @@ -355,6 +355,7 @@ buildbase() { lfsmake2 groff lfsmake2 gperf lfsmake2 gzip + lfsmake2 hostname lfsmake2 iproute2 lfsmake2 jwhois lfsmake2 kbd diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch new file mode 100644 index 0000000..d56ae59 --- /dev/null +++ b/src/patches/hostname-rh.patch @@ -0,0 +1,69 @@ +diff -up hostname/Makefile.rh hostname/Makefile +--- hostname/Makefile.rh 2013-11-04 10:12:59.670379153 +0100 ++++ hostname/Makefile 2013-11-04 10:15:04.957314495 +0100 +@@ -10,21 +10,17 @@ OBJS=hostname.o + + hostname: $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl +- ln -fs hostname dnsdomainname +- ln -fs hostname domainname +- ln -fs hostname ypdomainname +- ln -fs hostname nisdomainname + + install: hostname + install -d ${BASEDIR}$(MANDIR)/man1 +- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 ++ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1 + + install -d ${BASEDIR}$(BINDIR) +- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR) ++ install -m 0755 hostname ${BASEDIR}$(BINDIR) + ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname + ln -fs hostname ${BASEDIR}$(BINDIR)/domainname + ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname +diff -up hostname/hostname.1.rh hostname/hostname.1 +--- hostname/hostname.1.rh 2013-11-03 15:24:23.000000000 +0100 ++++ hostname/hostname.1 2013-11-04 10:12:59.670379153 +0100 +@@ -80,6 +80,28 @@ complete FQDN of the system is returned + .B "THE FQDN" + below). + ++.LP ++The function ++.BR gethostname(2) ++is used to get the hostname. When the ++.BR "hostname \-a, \-d, \-f or \-i" ++is called will ++.BR gethostbyname(3) ++be called. The difference in ++.BR gethostname(2) ++and ++.BR gethostbyname(3) ++is that ++.BR gethostbyname(3) ++is network aware, so it consults ++.IR /etc/nsswitch.conf ++and ++.IR /etc/host.conf ++to decide whether to read information in ++.IR /etc/hostname ++or ++.IR /etc/hosts ++ + .SS "SET NAME" + When called with one argument or with the + .B \-\-file +@@ -105,8 +127,7 @@ command (see + .B "THE FQDN" + below). + .LP +-The host name is usually set once at system startup in +-.I /etc/init.d/hostname.sh ++The host name is usually set once at system startup + (normally by reading the contents of a file which contains + the host name, e.g. + .IR /etc/hostname ). hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e0d208c5f4ea8a33b0c9bfe221090a0c961de82d
by git＠ipfire.org 03 Jun '14

03 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via e0d208c5f4ea8a33b0c9bfe221090a0c961de82d (commit) from a545f88e402a62d1b90a929b0e6622ae6eeeb143 (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 e0d208c5f4ea8a33b0c9bfe221090a0c961de82d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 3 18:20:27 2014 +0200 transmission: update to 2.83. ----------------------------------------------------------------------- Summary of changes: lfs/transmission | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/transmission b/lfs/transmission index 51c2fbd..cb4ad45 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.82 +VER = 2.83 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 = 9 +PAK_VER = 10 DEPS = "libevent2" @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661 +$(DL_FILE)_MD5 = 4620cfbfefee2ce55a6fa12c3ec330a7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2014