webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-20 07:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Stefan Schantl
2016-06-21 10:08:07 +02:00
parent 3a376d999e 96aeacd808
commit 59232d7225
99 changed files with 11731 additions and 1627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/cfgroot/general-functions.pl
View File

@@ -516,12 +516,14 @@ sub checksubnets
&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
foreach my $key (keys %ipsecconf){
if ($ipsecconf{$key}[11] ne ''){
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
$ipsecsub=&iporsubtodec($ipsecsub);
if($ipsecconf{$key}[1] ne $ccdname){
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
return $errormessage;
foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
$ipsecsub=&iporsubtodec($ipsecsub);
if($ipsecconf{$key}[1] ne $ccdname){
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
return $errormessage;
}
}
}
}

4
config/menu/30-network.menu
View File

@@ -3,9 +3,9 @@
'title' => "$Lang::tr{'net config'}",
'enabled' => 0,
};
$subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
$subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
'uri' => '/cgi-bin/proxy.cgi',
'title' => "Webproxy",
'title' => "$Lang::tr{'web proxy'}",
'enabled' => 1,
};
$subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},

2
config/qemu/65-kvm.rules Normal file
View File

@@ -0,0 +1,2 @@
KERNEL=="kvm", GROUP="kvm", MODE="0660"
KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"

1
config/rootfiles/common/armv5tel/initscripts
View File

@@ -45,6 +45,7 @@ etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb

6
config/rootfiles/common/armv5tel/linux-rpi
View File

@@ -45,6 +45,7 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/crypto/deflate.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/ecb.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/fcrypt.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/gcm.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/gf128mul.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/ghash-generic.ko
#lib/modules/KVER-ipfire-rpi/kernel/crypto/khazad.ko
@@ -981,10 +982,6 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/speakup/speakup_soft.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656/vt6656_stage.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond/w35und.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng/prism2_usb.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv_genirq.ko
@@ -1252,7 +1249,6 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_SYNPROXY.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ULOG.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ah.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_rpfilter.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_filter.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_mangle.ko

245
config/rootfiles/common/automake
View File

@@ -1,133 +1,130 @@
#usr/bin/aclocal
#usr/bin/aclocal-1.12
#usr/bin/aclocal-1.15
#usr/bin/automake
#usr/bin/automake-1.12
#usr/share/aclocal-1.12
#usr/share/aclocal-1.12/amversion.m4
#usr/share/aclocal-1.12/ar-lib.m4
#usr/share/aclocal-1.12/as.m4
#usr/share/aclocal-1.12/auxdir.m4
#usr/share/aclocal-1.12/ccstdc.m4
#usr/share/aclocal-1.12/cond-if.m4
#usr/share/aclocal-1.12/cond.m4
#usr/share/aclocal-1.12/depend.m4
#usr/share/aclocal-1.12/depout.m4
#usr/share/aclocal-1.12/dmalloc.m4
#usr/share/aclocal-1.12/gcj.m4
#usr/share/aclocal-1.12/header.m4
#usr/share/aclocal-1.12/init.m4
#usr/share/aclocal-1.12/install-sh.m4
#usr/share/aclocal-1.12/lead-dot.m4
#usr/share/aclocal-1.12/lex.m4
#usr/share/aclocal-1.12/lispdir.m4
#usr/share/aclocal-1.12/maintainer.m4
#usr/share/aclocal-1.12/make.m4
#usr/share/aclocal-1.12/minuso.m4
#usr/share/aclocal-1.12/missing.m4
#usr/share/aclocal-1.12/mkdirp.m4
#usr/share/aclocal-1.12/obsol-gt.m4
#usr/share/aclocal-1.12/obsol-lt.m4
#usr/share/aclocal-1.12/obsolete.m4
#usr/share/aclocal-1.12/options.m4
#usr/share/aclocal-1.12/protos.m4
#usr/share/aclocal-1.12/python.m4
#usr/share/aclocal-1.12/runlog.m4
#usr/share/aclocal-1.12/sanity.m4
#usr/share/aclocal-1.12/silent.m4
#usr/share/aclocal-1.12/strip.m4
#usr/share/aclocal-1.12/substnot.m4
#usr/share/aclocal-1.12/tar.m4
#usr/share/aclocal-1.12/upc.m4
#usr/share/aclocal-1.12/vala.m4
#usr/bin/automake-1.15
#usr/share/aclocal
#usr/share/aclocal-1.15
#usr/share/aclocal-1.15/amversion.m4
#usr/share/aclocal-1.15/ar-lib.m4
#usr/share/aclocal-1.15/as.m4
#usr/share/aclocal-1.15/auxdir.m4
#usr/share/aclocal-1.15/cond-if.m4
#usr/share/aclocal-1.15/cond.m4
#usr/share/aclocal-1.15/depend.m4
#usr/share/aclocal-1.15/depout.m4
#usr/share/aclocal-1.15/dmalloc.m4
#usr/share/aclocal-1.15/extra-recurs.m4
#usr/share/aclocal-1.15/gcj.m4
#usr/share/aclocal-1.15/init.m4
#usr/share/aclocal-1.15/install-sh.m4
#usr/share/aclocal-1.15/internal
#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4
#usr/share/aclocal-1.15/lead-dot.m4
#usr/share/aclocal-1.15/lex.m4
#usr/share/aclocal-1.15/lispdir.m4
#usr/share/aclocal-1.15/maintainer.m4
#usr/share/aclocal-1.15/make.m4
#usr/share/aclocal-1.15/missing.m4
#usr/share/aclocal-1.15/mkdirp.m4
#usr/share/aclocal-1.15/obsolete.m4
#usr/share/aclocal-1.15/options.m4
#usr/share/aclocal-1.15/prog-cc-c-o.m4
#usr/share/aclocal-1.15/python.m4
#usr/share/aclocal-1.15/runlog.m4
#usr/share/aclocal-1.15/sanity.m4
#usr/share/aclocal-1.15/silent.m4
#usr/share/aclocal-1.15/strip.m4
#usr/share/aclocal-1.15/substnot.m4
#usr/share/aclocal-1.15/tar.m4
#usr/share/aclocal-1.15/upc.m4
#usr/share/aclocal-1.15/vala.m4
#usr/share/aclocal/README
#usr/share/automake-1.12
#usr/share/automake-1.12/Automake
#usr/share/automake-1.12/Automake/ChannelDefs.pm
#usr/share/automake-1.12/Automake/Channels.pm
#usr/share/automake-1.12/Automake/Condition.pm
#usr/share/automake-1.12/Automake/Config.pm
#usr/share/automake-1.12/Automake/Configure_ac.pm
#usr/share/automake-1.12/Automake/DisjConditions.pm
#usr/share/automake-1.12/Automake/FileUtils.pm
#usr/share/automake-1.12/Automake/General.pm
#usr/share/automake-1.12/Automake/Getopt.pm
#usr/share/automake-1.12/Automake/Item.pm
#usr/share/automake-1.12/Automake/ItemDef.pm
#usr/share/automake-1.12/Automake/Location.pm
#usr/share/automake-1.12/Automake/Options.pm
#usr/share/automake-1.12/Automake/Rule.pm
#usr/share/automake-1.12/Automake/RuleDef.pm
#usr/share/automake-1.12/Automake/VarDef.pm
#usr/share/automake-1.12/Automake/Variable.pm
#usr/share/automake-1.12/Automake/Version.pm
#usr/share/automake-1.12/Automake/Wrap.pm
#usr/share/automake-1.12/Automake/XFile.pm
#usr/share/automake-1.12/COPYING
#usr/share/automake-1.12/INSTALL
#usr/share/automake-1.12/am
#usr/share/automake-1.12/am/check.am
#usr/share/automake-1.12/am/check2.am
#usr/share/automake-1.12/am/clean-hdr.am
#usr/share/automake-1.12/am/clean.am
#usr/share/automake-1.12/am/compile.am
#usr/share/automake-1.12/am/configure.am
#usr/share/automake-1.12/am/data.am
#usr/share/automake-1.12/am/dejagnu.am
#usr/share/automake-1.12/am/depend.am
#usr/share/automake-1.12/am/depend2.am
#usr/share/automake-1.12/am/distdir.am
#usr/share/automake-1.12/am/footer.am
#usr/share/automake-1.12/am/header-vars.am
#usr/share/automake-1.12/am/header.am
#usr/share/automake-1.12/am/inst-vars.am
#usr/share/automake-1.12/am/install.am
#usr/share/automake-1.12/am/java.am
#usr/share/automake-1.12/am/lang-compile.am
#usr/share/automake-1.12/am/lex.am
#usr/share/automake-1.12/am/library.am
#usr/share/automake-1.12/am/libs.am
#usr/share/automake-1.12/am/libtool.am
#usr/share/automake-1.12/am/lisp.am
#usr/share/automake-1.12/am/ltlib.am
#usr/share/automake-1.12/am/ltlibrary.am
#usr/share/automake-1.12/am/mans-vars.am
#usr/share/automake-1.12/am/mans.am
#usr/share/automake-1.12/am/program.am
#usr/share/automake-1.12/am/progs.am
#usr/share/automake-1.12/am/python.am
#usr/share/automake-1.12/am/remake-hdr.am
#usr/share/automake-1.12/am/scripts.am
#usr/share/automake-1.12/am/subdirs.am
#usr/share/automake-1.12/am/tags.am
#usr/share/automake-1.12/am/texi-vers.am
#usr/share/automake-1.12/am/texibuild.am
#usr/share/automake-1.12/am/texinfos.am
#usr/share/automake-1.12/am/vala.am
#usr/share/automake-1.12/am/yacc.am
#usr/share/automake-1.12/ar-lib
#usr/share/automake-1.12/compile
#usr/share/automake-1.12/config.guess
#usr/share/automake-1.12/config.sub
#usr/share/automake-1.12/depcomp
#usr/share/automake-1.12/elisp-comp
#usr/share/automake-1.12/install-sh
#usr/share/automake-1.12/mdate-sh
#usr/share/automake-1.12/missing
#usr/share/automake-1.12/mkinstalldirs
#usr/share/automake-1.12/py-compile
#usr/share/automake-1.12/tap-driver.pl
#usr/share/automake-1.12/tap-driver.sh
#usr/share/automake-1.12/test-driver
#usr/share/automake-1.12/texinfo.tex
#usr/share/automake-1.12/ylwrap
#usr/share/doc/automake
#usr/share/doc/automake/amhello-1.0.tar.gz
#usr/share/automake-1.15
#usr/share/automake-1.15/Automake
#usr/share/automake-1.15/Automake/ChannelDefs.pm
#usr/share/automake-1.15/Automake/Channels.pm
#usr/share/automake-1.15/Automake/Condition.pm
#usr/share/automake-1.15/Automake/Config.pm
#usr/share/automake-1.15/Automake/Configure_ac.pm
#usr/share/automake-1.15/Automake/DisjConditions.pm
#usr/share/automake-1.15/Automake/FileUtils.pm
#usr/share/automake-1.15/Automake/General.pm
#usr/share/automake-1.15/Automake/Getopt.pm
#usr/share/automake-1.15/Automake/Item.pm
#usr/share/automake-1.15/Automake/ItemDef.pm
#usr/share/automake-1.15/Automake/Language.pm
#usr/share/automake-1.15/Automake/Location.pm
#usr/share/automake-1.15/Automake/Options.pm
#usr/share/automake-1.15/Automake/Rule.pm
#usr/share/automake-1.15/Automake/RuleDef.pm
#usr/share/automake-1.15/Automake/VarDef.pm
#usr/share/automake-1.15/Automake/Variable.pm
#usr/share/automake-1.15/Automake/Version.pm
#usr/share/automake-1.15/Automake/Wrap.pm
#usr/share/automake-1.15/Automake/XFile.pm
#usr/share/automake-1.15/COPYING
#usr/share/automake-1.15/INSTALL
#usr/share/automake-1.15/am
#usr/share/automake-1.15/am/check.am
#usr/share/automake-1.15/am/check2.am
#usr/share/automake-1.15/am/clean-hdr.am
#usr/share/automake-1.15/am/clean.am
#usr/share/automake-1.15/am/compile.am
#usr/share/automake-1.15/am/configure.am
#usr/share/automake-1.15/am/data.am
#usr/share/automake-1.15/am/dejagnu.am
#usr/share/automake-1.15/am/depend.am
#usr/share/automake-1.15/am/depend2.am
#usr/share/automake-1.15/am/distdir.am
#usr/share/automake-1.15/am/footer.am
#usr/share/automake-1.15/am/header-vars.am
#usr/share/automake-1.15/am/header.am
#usr/share/automake-1.15/am/inst-vars.am
#usr/share/automake-1.15/am/install.am
#usr/share/automake-1.15/am/java.am
#usr/share/automake-1.15/am/lang-compile.am
#usr/share/automake-1.15/am/lex.am
#usr/share/automake-1.15/am/library.am
#usr/share/automake-1.15/am/libs.am
#usr/share/automake-1.15/am/libtool.am
#usr/share/automake-1.15/am/lisp.am
#usr/share/automake-1.15/am/ltlib.am
#usr/share/automake-1.15/am/ltlibrary.am
#usr/share/automake-1.15/am/mans-vars.am
#usr/share/automake-1.15/am/mans.am
#usr/share/automake-1.15/am/program.am
#usr/share/automake-1.15/am/progs.am
#usr/share/automake-1.15/am/python.am
#usr/share/automake-1.15/am/remake-hdr.am
#usr/share/automake-1.15/am/scripts.am
#usr/share/automake-1.15/am/subdirs.am
#usr/share/automake-1.15/am/tags.am
#usr/share/automake-1.15/am/texi-vers.am
#usr/share/automake-1.15/am/texibuild.am
#usr/share/automake-1.15/am/texinfos.am
#usr/share/automake-1.15/am/vala.am
#usr/share/automake-1.15/am/yacc.am
#usr/share/automake-1.15/ar-lib
#usr/share/automake-1.15/compile
#usr/share/automake-1.15/config.guess
#usr/share/automake-1.15/config.sub
#usr/share/automake-1.15/depcomp
#usr/share/automake-1.15/install-sh
#usr/share/automake-1.15/mdate-sh
#usr/share/automake-1.15/missing
#usr/share/automake-1.15/mkinstalldirs
#usr/share/automake-1.15/py-compile
#usr/share/automake-1.15/tap-driver.sh
#usr/share/automake-1.15/test-driver
#usr/share/automake-1.15/texinfo.tex
#usr/share/automake-1.15/ylwrap
#usr/share/doc/automake-1.15
#usr/share/doc/automake-1.15/amhello-1.0.tar.gz
#usr/share/info/automake-history.info
#usr/share/info/automake.info
#usr/share/info/automake.info-1
#usr/share/info/automake.info-2
#usr/share/info/automake.info-3
#usr/share/man/man1/aclocal-1.12.1
#usr/share/man/man1/aclocal-1.15.1
#usr/share/man/man1/aclocal.1
#usr/share/man/man1/automake-1.12.1
#usr/share/man/man1/automake-1.15.1
#usr/share/man/man1/automake.1

5
config/rootfiles/common/findutils
View File

@@ -1,8 +1,7 @@
bin/find
#etc/fcron.weekly
etc/fcron.weekly/updatedb
bin/find
usr/bin/locate
#usr/bin/oldfind
usr/bin/updatedb
usr/bin/xargs
#usr/lib/findutils
@@ -11,6 +10,8 @@ usr/lib/findutils/code
usr/lib/findutils/frcode
#usr/share/info/find-maint.info
#usr/share/info/find.info
#usr/share/info/find.info-1
#usr/share/info/find.info-2
#usr/share/man/man1/find.1
#usr/share/man/man1/locate.1
#usr/share/man/man1/updatedb.1

1
config/rootfiles/common/flex
View File

@@ -1,6 +1,7 @@
#usr/bin/flex
#usr/bin/lex
#usr/include/FlexLexer.h
#usr/info/dir
#usr/info/flex.info
#usr/info/flex.info-1
#usr/info/flex.info-2

6
config/rootfiles/common/gettext
View File

@@ -1,7 +1,7 @@
#usr/bin/autopoint
#usr/bin/envsubst
#usr/bin/gettext
#usr/bin/gettext.sh
usr/bin/envsubst
usr/bin/gettext
usr/bin/gettext.sh
#usr/bin/gettextize
#usr/bin/msgattrib
#usr/bin/msgcat

2
config/rootfiles/common/i586/initscripts
View File

@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirt-guests
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb

1
config/rootfiles/common/linux-atm
View File

@@ -21,6 +21,7 @@ usr/lib/libatm.so.1.0.0
#usr/man/man4/atmsigd.conf.4
#usr/man/man7/qos.7
#usr/man/man7/sap.7
#usr/man/man8
#usr/man/man8/atmaddr.8
#usr/man/man8/atmarp.8
#usr/man/man8/atmarpd.8

1863
config/rootfiles/common/ncurses
View File

File diff suppressed because it is too large Load Diff

3610
config/rootfiles/common/ncurses-compat Normal file
View File

File diff suppressed because it is too large Load Diff

4
config/rootfiles/common/newt
View File

@@ -13,6 +13,8 @@ usr/lib/libnewt.so.0.52.18
#usr/share/locale/as
#usr/share/locale/as/LC_MESSAGES
#usr/share/locale/as/LC_MESSAGES/newt.mo
#usr/share/locale/ast
#usr/share/locale/ast/LC_MESSAGES
#usr/share/locale/ast/LC_MESSAGES/newt.mo
#usr/share/locale/bal
#usr/share/locale/bal/LC_MESSAGES
@@ -100,6 +102,8 @@ usr/lib/libnewt.so.0.52.18
#usr/share/locale/nn
#usr/share/locale/nn/LC_MESSAGES
#usr/share/locale/nn/LC_MESSAGES/newt.mo
#usr/share/locale/pa
#usr/share/locale/pa/LC_MESSAGES
#usr/share/locale/pa/LC_MESSAGES/newt.mo
#usr/share/locale/pl/LC_MESSAGES/newt.mo
#usr/share/locale/pt/LC_MESSAGES/newt.mo

98
config/rootfiles/common/shadow
View File

@@ -1,17 +1,16 @@
bin/groups
bin/login
bin/passwd
bin/su
#etc/.pwd.lock
#etc/default
#etc/default/useradd
etc/limits
etc/login.access
etc/login.defs
#etc/passwd-
etc/shadow
#etc/shadow-
lib/libshadow.so.0
lib/libshadow.so.0.0.0
sbin/nologin
#usr/bin/chage
#usr/bin/chfn
#usr/bin/chsh
@@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0
#usr/bin/faillog
#usr/bin/gpasswd
#usr/bin/lastlog
#usr/bin/newgidmap
#usr/bin/newgrp
#usr/bin/newuidmap
#usr/bin/sg
#usr/lib/libshadow.a
#usr/lib/libshadow.la
#usr/lib/libshadow.so
#usr/man/man1/chage.1
#usr/man/man1/chfn.1
#usr/man/man1/chsh.1
#usr/man/man1/expiry.1
#usr/man/man1/gpasswd.1
#usr/man/man1/login.1
#usr/man/man1/newgrp.1
#usr/man/man1/passwd.1
#usr/man/man1/sg.1
#usr/man/man1/su.1
#usr/man/man3/getspnam.3
#usr/man/man3/shadow.3
#usr/man/man5/faillog.5
#usr/man/man5/gshadow.5
#usr/man/man5/limits.5
#usr/man/man5/login.access.5
#usr/man/man5/login.defs.5
#usr/man/man5/passwd.5
#usr/man/man5/porttime.5
#usr/man/man5/shadow.5
#usr/man/man5/suauth.5
#usr/man/man8
#usr/man/man8/chpasswd.8
#usr/man/man8/faillog.8
#usr/man/man8/groupadd.8
#usr/man/man8/groupdel.8
#usr/man/man8/groupmod.8
#usr/man/man8/grpck.8
#usr/man/man8/grpconv.8
#usr/man/man8/grpunconv.8
#usr/man/man8/lastlog.8
#usr/man/man8/logoutd.8
#usr/man/man8/newusers.8
#usr/man/man8/nologin.8
#usr/man/man8/pwck.8
#usr/man/man8/pwconv.8
#usr/man/man8/pwunconv.8
#usr/man/man8/useradd.8
#usr/man/man8/userdel.8
#usr/man/man8/usermod.8
#usr/man/man8/vigr.8
#usr/man/man8/vipw.8
#usr/sbin/chgpasswd
usr/sbin/chpasswd
usr/sbin/groupadd
usr/sbin/groupdel
usr/sbin/groupmems
usr/sbin/groupmod
#usr/sbin/grpck
usr/sbin/grpconv
#usr/sbin/grpunconv
#usr/sbin/logoutd
#usr/sbin/newusers
#usr/sbin/nologin
#usr/sbin/pwck
usr/sbin/pwconv
#usr/sbin/pwunconv
@@ -85,3 +42,48 @@ usr/sbin/userdel
usr/sbin/usermod
#usr/sbin/vigr
#usr/sbin/vipw
#usr/share/man/man1/chage.1
#usr/share/man/man1/chfn.1
#usr/share/man/man1/chsh.1
#usr/share/man/man1/expiry.1
#usr/share/man/man1/gpasswd.1
#usr/share/man/man1/login.1
#usr/share/man/man1/newgidmap.1
#usr/share/man/man1/newgrp.1
#usr/share/man/man1/newuidmap.1
#usr/share/man/man1/passwd.1
#usr/share/man/man1/sg.1
#usr/share/man/man1/su.1
#usr/share/man/man3/shadow.3
#usr/share/man/man5/faillog.5
#usr/share/man/man5/gshadow.5
#usr/share/man/man5/limits.5
#usr/share/man/man5/login.access.5
#usr/share/man/man5/login.defs.5
#usr/share/man/man5/porttime.5
#usr/share/man/man5/shadow.5
#usr/share/man/man5/suauth.5
#usr/share/man/man5/subgid.5
#usr/share/man/man5/subuid.5
#usr/share/man/man8/chgpasswd.8
#usr/share/man/man8/chpasswd.8
#usr/share/man/man8/faillog.8
#usr/share/man/man8/groupadd.8
#usr/share/man/man8/groupdel.8
#usr/share/man/man8/groupmems.8
#usr/share/man/man8/groupmod.8
#usr/share/man/man8/grpck.8
#usr/share/man/man8/grpconv.8
#usr/share/man/man8/grpunconv.8
#usr/share/man/man8/lastlog.8
#usr/share/man/man8/logoutd.8
#usr/share/man/man8/newusers.8
#usr/share/man/man8/nologin.8
#usr/share/man/man8/pwck.8
#usr/share/man/man8/pwconv.8
#usr/share/man/man8/pwunconv.8
#usr/share/man/man8/useradd.8
#usr/share/man/man8/userdel.8
#usr/share/man/man8/usermod.8
#usr/share/man/man8/vigr.8
#usr/share/man/man8/vipw.8

1
config/rootfiles/common/udev
View File

@@ -28,6 +28,7 @@ lib/udev
#lib/udev/hwdb.d/60-keyboard.hwdb
#lib/udev/init-net-rules.sh
#lib/udev/mtd_probe
#lib/udev/network-hotplug-macvtap
#lib/udev/network-hotplug-rename
#lib/udev/network-hotplug-vlan
#lib/udev/rule_generator.functions

4
config/rootfiles/common/util-macros Normal file
View File

@@ -0,0 +1,4 @@
#usr/share/aclocal/xorg-macros.m4
#usr/share/pkgconfig/xorg-macros.pc
#usr/share/util-macros
#usr/share/util-macros/INSTALL

2
config/rootfiles/common/x86_64/initscripts
View File

@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/lcdproc
#etc/rc.d/init.d/lcr
etc/rc.d/init.d/leds
#etc/rc.d/init.d/libvirt-guests
#etc/rc.d/init.d/libvirtd
etc/rc.d/init.d/localnet
etc/rc.d/init.d/mISDN
#etc/rc.d/init.d/mediatomb

0
config/rootfiles/core/103/exclude → config/rootfiles/core/104/exclude
View File

1
config/rootfiles/core/103/filelists/files → config/rootfiles/core/104/filelists/files
View File

@@ -1,2 +1,3 @@
etc/system-release
etc/issue
opt/pakfire/lib/functions.sh

1
config/rootfiles/core/104/filelists/ntp Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ntp

1
config/rootfiles/core/104/filelists/shadow Symbolic link
View File

@@ -0,0 +1 @@
../../../common/shadow

1
config/rootfiles/core/104/filelists/wget Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wget

0
config/rootfiles/core/103/meta → config/rootfiles/core/104/meta
View File

13
config/rootfiles/core/103/update.sh → config/rootfiles/core/104/update.sh
View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=103
core=104
function exit_with_error() {
# Set last succesfull installed core.
@@ -40,16 +40,14 @@ do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
# Stop services
# Remove checkfstab
rm -f /etc/rc.d/init.d/checkfstab
rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
# Extract files
extract_files
# Remove some old files
rm -f /bin/groups /lib/libshadow.so.0*
# update linker config
ldconfig
@@ -57,11 +55,10 @@ ldconfig
#/usr/local/bin/update-lang-cache
# Start services
/etc/init.d/dnsmasq restart
sync
# This update need a reboot...
touch /var/run/need_reboot
sync
# Finish
/etc/init.d/fireinfo start

28
config/rootfiles/oldcore/103/exclude Normal file
View File

@@ -0,0 +1,28 @@
boot/config.txt
boot/grub/grub.cfg
boot/grub/grubenv
etc/alternatives
etc/collectd.custom
etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
etc/sudoers
etc/sysconfig/firewall.local
etc/sysconfig/rc.local
etc/udev/rules.d/30-persistent-network.rules
srv/web/ipfire/html/proxy.pac
var/ipfire/dma
var/ipfire/time
var/ipfire/ovpn
var/lib/alternatives
var/log/cache
var/state/dhcp/dhcpd.leases
var/updatecache

1
config/rootfiles/oldcore/103/filelists/coreutils Symbolic link
View File

@@ -0,0 +1 @@
../../../common/coreutils

1
config/rootfiles/oldcore/103/filelists/curl Symbolic link
View File

@@ -0,0 +1 @@
../../../common/curl

1
config/rootfiles/oldcore/103/filelists/diffutils Symbolic link
View File

@@ -0,0 +1 @@
../../../common/diffutils

0
config/rootfiles/core/103/filelists/dnsmasq → config/rootfiles/oldcore/103/filelists/dnsmasq
View File

9
config/rootfiles/oldcore/103/filelists/files Normal file
View File

@@ -0,0 +1,9 @@
etc/system-release
etc/issue
lib/udev/network-hotplug-macvtap
lib/udev/network-hotplug-rename
lib/udev/rules.d/60-net.rules
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
usr/sbin/setup
var/ipfire/general-functions.pl
var/ipfire/menu.d/30-network.menu

1
config/rootfiles/oldcore/103/filelists/findutils Symbolic link
View File

@@ -0,0 +1 @@
../../../common/findutils

1
config/rootfiles/oldcore/103/filelists/gawk Symbolic link
View File

@@ -0,0 +1 @@
../../../common/gawk

1
config/rootfiles/oldcore/103/filelists/gettext Symbolic link
View File

@@ -0,0 +1 @@
../../../common/gettext

1
config/rootfiles/oldcore/103/filelists/grep Symbolic link
View File

@@ -0,0 +1 @@
../../../common/grep

1
config/rootfiles/oldcore/103/filelists/less Symbolic link
View File

@@ -0,0 +1 @@
../../../common/less

1
config/rootfiles/oldcore/103/filelists/ncurses Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ncurses

1
config/rootfiles/oldcore/103/filelists/ncurses-compat Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ncurses-compat

1
config/rootfiles/oldcore/103/filelists/procps Symbolic link
View File

@@ -0,0 +1 @@
../../../common/procps

1
config/rootfiles/oldcore/103/filelists/sdparm Symbolic link
View File

@@ -0,0 +1 @@
../../../common/sdparm

1
config/rootfiles/oldcore/103/filelists/squid Symbolic link
View File

@@ -0,0 +1 @@
../../../common/squid

1
config/rootfiles/oldcore/103/filelists/tzdata Symbolic link
View File

@@ -0,0 +1 @@
../../../common/tzdata

1
config/rootfiles/oldcore/103/filelists/wpa_supplicant Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wpa_supplicant

1
config/rootfiles/oldcore/103/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

82
config/rootfiles/oldcore/103/update.sh Normal file
View File

@@ -0,0 +1,82 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2016 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=103
function exit_with_error() {
# Set last succesfull installed core.
echo $(($core-1)) > /opt/pakfire/db/core/mine
/usr/bin/logger -p syslog.emerg -t ipfire \
"core-update-${core}: $1"
exit $2
}
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
# Stop services
/etc/init.d/squid stop
# Remove checkfstab
rm -f /etc/rc.d/init.d/checkfstab
rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
# Extract files
extract_files
# update linker config
ldconfig
# Update Language cache
#/usr/local/bin/update-lang-cache
# Remove potentially broken squid cache index (will be recreated after the next start)
rm -f /var/log/cache/swap.state
# Start services
/etc/init.d/dnsmasq restart
/etc/init.d/squid start
sync
# This update need a reboot...
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
sendprofile
# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
grub-mkconfig -o /boot/grub/grub.cfg
fi
sync
# Don't report the exitcode last command
exit 0

6
config/rootfiles/packages/igmpproxy
View File

@@ -1,5 +1,5 @@
etc/igmpproxy.conf
usr/local/sbin/igmpproxy
#usr/local/share/man/man5/igmpproxy.conf.5
#usr/local/share/man/man8/igmpproxy.8
usr/sbin/igmpproxy
#usr/share/man/man5/igmpproxy.conf.5
#usr/share/man/man8/igmpproxy.8
var/ipfire/backup/addons/includes/igmpproxy

7
config/rootfiles/packages/libpciaccess Normal file
View File

@@ -0,0 +1,7 @@
#usr/include/pciaccess.h
#usr/lib/libpciaccess.a
#usr/lib/libpciaccess.la
#usr/lib/libpciaccess.so
usr/lib/libpciaccess.so.0
usr/lib/libpciaccess.so.0.11.1
#usr/lib/pkgconfig/pciaccess.pc

287
config/rootfiles/packages/libvirt Normal file
View File

@@ -0,0 +1,287 @@
#etc/libvirt
etc/libvirt/libvirt.conf
etc/libvirt/libvirtd.conf
#etc/libvirt/nwfilter
#etc/libvirt/nwfilter/allow-arp.xml
#etc/libvirt/nwfilter/allow-dhcp-server.xml
#etc/libvirt/nwfilter/allow-dhcp.xml
#etc/libvirt/nwfilter/allow-incoming-ipv4.xml
#etc/libvirt/nwfilter/allow-ipv4.xml
#etc/libvirt/nwfilter/clean-traffic.xml
#etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
#etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
#etc/libvirt/nwfilter/no-arp-spoofing.xml
#etc/libvirt/nwfilter/no-ip-multicast.xml
#etc/libvirt/nwfilter/no-ip-spoofing.xml
#etc/libvirt/nwfilter/no-mac-broadcast.xml
#etc/libvirt/nwfilter/no-mac-spoofing.xml
#etc/libvirt/nwfilter/no-other-l2-traffic.xml
#etc/libvirt/nwfilter/no-other-rarp-traffic.xml
#etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
#etc/libvirt/nwfilter/qemu-announce-self.xml
etc/libvirt/qemu-lockd.conf
etc/libvirt/qemu.conf
etc/libvirt/virtlockd.conf
etc/logrotate.d/libvirtd
etc/logrotate.d/libvirtd.libxl
#etc/logrotate.d/libvirtd.lxc
etc/logrotate.d/libvirtd.qemu
#etc/logrotate.d/libvirtd.uml
etc/rc.d/init.d/libvirt-guests
etc/rc.d/init.d/libvirtd
usr/bin/virsh
usr/bin/virt-host-validate
usr/bin/virt-pki-validate
usr/bin/virt-xml-validate
#usr/include/libvirt
#usr/include/libvirt/libvirt-domain-snapshot.h
#usr/include/libvirt/libvirt-domain.h
#usr/include/libvirt/libvirt-event.h
#usr/include/libvirt/libvirt-host.h
#usr/include/libvirt/libvirt-interface.h
#usr/include/libvirt/libvirt-lxc.h
#usr/include/libvirt/libvirt-network.h
#usr/include/libvirt/libvirt-nodedev.h
#usr/include/libvirt/libvirt-nwfilter.h
#usr/include/libvirt/libvirt-qemu.h
#usr/include/libvirt/libvirt-secret.h
#usr/include/libvirt/libvirt-storage.h
#usr/include/libvirt/libvirt-stream.h
#usr/include/libvirt/libvirt.h
#usr/include/libvirt/virterror.h
#usr/lib/libvirt
#usr/lib/libvirt-admin.la
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
usr/lib/libvirt-admin.so.0.1002.18
#usr/lib/libvirt-lxc.la
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
usr/lib/libvirt-lxc.so.0.1002.18
#usr/lib/libvirt-qemu.la
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
usr/lib/libvirt-qemu.so.0.1002.18
#usr/lib/libvirt.la
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
usr/lib/libvirt.so.0.1002.18
#usr/lib/libvirt/connection-driver
#usr/lib/libvirt/connection-driver/libvirt_driver_interface.la
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
#usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.la
usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.so
#usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.la
usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so
#usr/lib/libvirt/connection-driver/libvirt_driver_qemu.la
usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so
#usr/lib/libvirt/connection-driver/libvirt_driver_secret.la
usr/lib/libvirt/connection-driver/libvirt_driver_secret.so
#usr/lib/libvirt/connection-driver/libvirt_driver_storage.la
usr/lib/libvirt/connection-driver/libvirt_driver_storage.so
#usr/lib/libvirt/lock-driver
#usr/lib/libvirt/lock-driver/lockd.la
usr/lib/libvirt/lock-driver/lockd.so
#usr/lib/pkgconfig/libvirt-lxc.pc
#usr/lib/pkgconfig/libvirt-qemu.pc
#usr/lib/pkgconfig/libvirt.pc
#usr/lib/sysctl.d
usr/lib/sysctl.d/60-libvirtd.conf
usr/libexec/libvirt_iohelper
usr/sbin/libvirtd
usr/sbin/virtlockd
#usr/share/augeas
#usr/share/augeas/lenses
#usr/share/augeas/lenses/libvirt_lockd.aug
#usr/share/augeas/lenses/libvirtd.aug
#usr/share/augeas/lenses/libvirtd_qemu.aug
#usr/share/augeas/lenses/tests
#usr/share/augeas/lenses/tests/test_libvirt_lockd.aug
#usr/share/augeas/lenses/tests/test_libvirtd.aug
#usr/share/augeas/lenses/tests/test_libvirtd_qemu.aug
#usr/share/augeas/lenses/tests/test_virtlockd.aug
#usr/share/augeas/lenses/virtlockd.aug
#usr/share/doc/libvirt-1.2.18.3
#usr/share/doc/libvirt-1.2.18.3/html
#usr/share/doc/libvirt-1.2.18.3/html/32favicon.png
#usr/share/doc/libvirt-1.2.18.3/html/404.html
#usr/share/doc/libvirt-1.2.18.3/html/acl.html
#usr/share/doc/libvirt-1.2.18.3/html/aclpolkit.html
#usr/share/doc/libvirt-1.2.18.3/html/api.html
#usr/share/doc/libvirt-1.2.18.3/html/api_extension.html
#usr/share/doc/libvirt-1.2.18.3/html/apps.html
#usr/share/doc/libvirt-1.2.18.3/html/archdomain.html
#usr/share/doc/libvirt-1.2.18.3/html/architecture.gif
#usr/share/doc/libvirt-1.2.18.3/html/architecture.html
#usr/share/doc/libvirt-1.2.18.3/html/archnetwork.html
#usr/share/doc/libvirt-1.2.18.3/html/archnode.html
#usr/share/doc/libvirt-1.2.18.3/html/archstorage.html
#usr/share/doc/libvirt-1.2.18.3/html/auditlog.html
#usr/share/doc/libvirt-1.2.18.3/html/auth.html
#usr/share/doc/libvirt-1.2.18.3/html/bindings.html
#usr/share/doc/libvirt-1.2.18.3/html/bugs.html
#usr/share/doc/libvirt-1.2.18.3/html/cgroups.html
#usr/share/doc/libvirt-1.2.18.3/html/compiling.html
#usr/share/doc/libvirt-1.2.18.3/html/contact.html
#usr/share/doc/libvirt-1.2.18.3/html/csharp.html
#usr/share/doc/libvirt-1.2.18.3/html/deployment.html
#usr/share/doc/libvirt-1.2.18.3/html/devguide.html
#usr/share/doc/libvirt-1.2.18.3/html/docs.html
#usr/share/doc/libvirt-1.2.18.3/html/downloads.html
#usr/share/doc/libvirt-1.2.18.3/html/drivers.html
#usr/share/doc/libvirt-1.2.18.3/html/drvbhyve.html
#usr/share/doc/libvirt-1.2.18.3/html/drvesx.html
#usr/share/doc/libvirt-1.2.18.3/html/drvhyperv.html
#usr/share/doc/libvirt-1.2.18.3/html/drvlxc.html
#usr/share/doc/libvirt-1.2.18.3/html/drvopenvz.html
#usr/share/doc/libvirt-1.2.18.3/html/drvparallels.html
#usr/share/doc/libvirt-1.2.18.3/html/drvphyp.html
#usr/share/doc/libvirt-1.2.18.3/html/drvqemu.html
#usr/share/doc/libvirt-1.2.18.3/html/drvremote.html
#usr/share/doc/libvirt-1.2.18.3/html/drvtest.html
#usr/share/doc/libvirt-1.2.18.3/html/drvuml.html
#usr/share/doc/libvirt-1.2.18.3/html/drvvbox.html
#usr/share/doc/libvirt-1.2.18.3/html/drvvmware.html
#usr/share/doc/libvirt-1.2.18.3/html/drvxen.html
#usr/share/doc/libvirt-1.2.18.3/html/errors.html
#usr/share/doc/libvirt-1.2.18.3/html/et.png
#usr/share/doc/libvirt-1.2.18.3/html/firewall.html
#usr/share/doc/libvirt-1.2.18.3/html/footer_corner.png
#usr/share/doc/libvirt-1.2.18.3/html/footer_pattern.png
#usr/share/doc/libvirt-1.2.18.3/html/format.html
#usr/share/doc/libvirt-1.2.18.3/html/formatcaps.html
#usr/share/doc/libvirt-1.2.18.3/html/formatdomain.html
#usr/share/doc/libvirt-1.2.18.3/html/formatdomaincaps.html
#usr/share/doc/libvirt-1.2.18.3/html/formatnetwork.html
#usr/share/doc/libvirt-1.2.18.3/html/formatnode.html
#usr/share/doc/libvirt-1.2.18.3/html/formatnwfilter.html
#usr/share/doc/libvirt-1.2.18.3/html/formatsecret.html
#usr/share/doc/libvirt-1.2.18.3/html/formatsnapshot.html
#usr/share/doc/libvirt-1.2.18.3/html/formatstorage.html
#usr/share/doc/libvirt-1.2.18.3/html/formatstorageencryption.html
#usr/share/doc/libvirt-1.2.18.3/html/generic.css
#usr/share/doc/libvirt-1.2.18.3/html/goals.html
#usr/share/doc/libvirt-1.2.18.3/html/governance.html
#usr/share/doc/libvirt-1.2.18.3/html/hacking.html
#usr/share/doc/libvirt-1.2.18.3/html/hooks.html
#usr/share/doc/libvirt-1.2.18.3/html/html
#usr/share/doc/libvirt-1.2.18.3/html/html/home.png
#usr/share/doc/libvirt-1.2.18.3/html/html/index.html
#usr/share/doc/libvirt-1.2.18.3/html/html/left.png
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain-snapshot.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-event.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-host.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-interface.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-network.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nodedev.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nwfilter.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-secret.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-storage.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-stream.html
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-virterror.html
#usr/share/doc/libvirt-1.2.18.3/html/html/right.png
#usr/share/doc/libvirt-1.2.18.3/html/html/up.png
#usr/share/doc/libvirt-1.2.18.3/html/hvsupport.html
#usr/share/doc/libvirt-1.2.18.3/html/index.html
#usr/share/doc/libvirt-1.2.18.3/html/internals
#usr/share/doc/libvirt-1.2.18.3/html/internals.html
#usr/share/doc/libvirt-1.2.18.3/html/internals/command.html
#usr/share/doc/libvirt-1.2.18.3/html/internals/locking.html
#usr/share/doc/libvirt-1.2.18.3/html/internals/oomtesting.html
#usr/share/doc/libvirt-1.2.18.3/html/internals/rpc.html
#usr/share/doc/libvirt-1.2.18.3/html/intro.html
#usr/share/doc/libvirt-1.2.18.3/html/java.html
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-daemon-arch.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-driver-arch.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-bg.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-logo.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-logical.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-physical.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-object-model.png
#usr/share/doc/libvirt-1.2.18.3/html/libvirt.css
#usr/share/doc/libvirt-1.2.18.3/html/libvirtLogo.png
#usr/share/doc/libvirt-1.2.18.3/html/locking-lockd.html
#usr/share/doc/libvirt-1.2.18.3/html/locking-sanlock.html
#usr/share/doc/libvirt-1.2.18.3/html/locking.html
#usr/share/doc/libvirt-1.2.18.3/html/logging.html
#usr/share/doc/libvirt-1.2.18.3/html/madeWith.png
#usr/share/doc/libvirt-1.2.18.3/html/main.css
#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-direct.png
#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-p2p.png
#usr/share/doc/libvirt-1.2.18.3/html/migration-native.png
#usr/share/doc/libvirt-1.2.18.3/html/migration-tunnel.png
#usr/share/doc/libvirt-1.2.18.3/html/migration-unmanaged-direct.png
#usr/share/doc/libvirt-1.2.18.3/html/migration.html
#usr/share/doc/libvirt-1.2.18.3/html/news.html
#usr/share/doc/libvirt-1.2.18.3/html/node.gif
#usr/share/doc/libvirt-1.2.18.3/html/pending.html
#usr/share/doc/libvirt-1.2.18.3/html/php.html
#usr/share/doc/libvirt-1.2.18.3/html/python.html
#usr/share/doc/libvirt-1.2.18.3/html/relatedlinks.html
#usr/share/doc/libvirt-1.2.18.3/html/remote.html
#usr/share/doc/libvirt-1.2.18.3/html/secureusage.html
#usr/share/doc/libvirt-1.2.18.3/html/securityprocess.html
#usr/share/doc/libvirt-1.2.18.3/html/sitemap.html
#usr/share/doc/libvirt-1.2.18.3/html/storage.html
#usr/share/doc/libvirt-1.2.18.3/html/testapi.html
#usr/share/doc/libvirt-1.2.18.3/html/testsuites.html
#usr/share/doc/libvirt-1.2.18.3/html/testtck.html
#usr/share/doc/libvirt-1.2.18.3/html/todo.html
#usr/share/doc/libvirt-1.2.18.3/html/uri.html
#usr/share/doc/libvirt-1.2.18.3/html/virshcmdref.html
#usr/share/doc/libvirt-1.2.18.3/html/windows.html
#usr/share/gtk-doc/html/libvirt
#usr/share/gtk-doc/html/libvirt/general.html
#usr/share/gtk-doc/html/libvirt/home.png
#usr/share/gtk-doc/html/libvirt/index.html
#usr/share/gtk-doc/html/libvirt/left.png
#usr/share/gtk-doc/html/libvirt/libvirt-virterror.html
#usr/share/gtk-doc/html/libvirt/libvirt.devhelp
#usr/share/gtk-doc/html/libvirt/right.png
#usr/share/gtk-doc/html/libvirt/style.css
#usr/share/gtk-doc/html/libvirt/up.png
#usr/share/libvirt
#usr/share/libvirt/api
usr/share/libvirt/api/libvirt-api.xml
usr/share/libvirt/api/libvirt-lxc-api.xml
usr/share/libvirt/api/libvirt-qemu-api.xml
usr/share/libvirt/cpu_map.xml
#usr/share/libvirt/libvirtLogo.png
#usr/share/libvirt/schemas
usr/share/libvirt/schemas/basictypes.rng
usr/share/libvirt/schemas/capability.rng
usr/share/libvirt/schemas/domain.rng
usr/share/libvirt/schemas/domaincaps.rng
usr/share/libvirt/schemas/domaincommon.rng
usr/share/libvirt/schemas/domainsnapshot.rng
usr/share/libvirt/schemas/interface.rng
usr/share/libvirt/schemas/network.rng
usr/share/libvirt/schemas/networkcommon.rng
usr/share/libvirt/schemas/nodedev.rng
usr/share/libvirt/schemas/nwfilter.rng
usr/share/libvirt/schemas/secret.rng
usr/share/libvirt/schemas/storagecommon.rng
usr/share/libvirt/schemas/storagepool.rng
usr/share/libvirt/schemas/storagevol.rng
#usr/share/man/man1/virsh.1
#usr/share/man/man1/virt-host-validate.1
#usr/share/man/man1/virt-pki-validate.1
#usr/share/man/man1/virt-xml-validate.1
#usr/share/man/man8/libvirtd.8
#usr/share/man/man8/virtlockd.8
#var/cache/libvirt
var/cache/libvirt/qemu
#var/lib/libvirt
var/lib/libvirt/boot
var/lib/libvirt/filesystems
var/lib/libvirt/images
#var/lib/libvirt/lockd
var/lib/libvirt/lockd/files
var/lib/libvirt/qemu
#var/log/libvirt
#var/log/libvirt/lxc
var/log/libvirt/qemu
#var/log/libvirt/uml
etc/rc.d/init.d/libvirt-guests
etc/rc.d/init.d/libvirtd

13
config/rootfiles/packages/libyajl Normal file
View File

@@ -0,0 +1,13 @@
usr/bin/json_reformat
usr/bin/json_verify
#usr/include/yajl
#usr/include/yajl/yajl_common.h
#usr/include/yajl/yajl_gen.h
#usr/include/yajl/yajl_parse.h
#usr/include/yajl/yajl_tree.h
#usr/include/yajl/yajl_version.h
#usr/lib/libyajl.so
usr/lib/libyajl.so.2
usr/lib/libyajl.so.2.1.0
#usr/lib/libyajl_s.a
#usr/share/pkgconfig/yajl.pc

1
config/rootfiles/packages/qemu
View File

@@ -1,3 +1,4 @@
lib/udev/rules.d/65-kvm.rules
usr/bin/qemu
usr/bin/qemu-arm
usr/bin/qemu-ga

3
config/udev/60-net.rules
View File

@@ -5,3 +5,6 @@ ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RES
# Call a script that will create all virtual devices for a parent device
# that has just come up.
ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-vlan"
# Call a script that will set up macvtap interfaces
ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-macvtap"

46
config/udev/network-hotplug-macvtap Normal file
View File

@@ -0,0 +1,46 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
# #
############################################################################
[ -n "${INTERFACE}" ] || exit 2
PHYSICAL_INTERFACE="${INTERFACE}"
VIRTUAL_INTERFACE="${INTERFACE%phys}"
#VIRTUAL_INTERFACE="${VIRTUAL_INTERFACE}0"
# Do nothing if the physical interface does not end with "phys"
case "${PHYSICAL_INTERFACE}" in
*phys)
;;
*)
exit 0
;;
esac
ADDRESS="$(</sys/class/net/${PHYSICAL_INTERFACE}/address)"
rand="$(</proc/sys/kernel/random/uuid)"
rand="${rand//-/}"
GENERATED_ADDRESS=$(echo "02:${rand:0:2}:${rand:2:2}:${rand:4:2}:${rand:6:2}:${rand:8:2}")
ip link add link "${PHYSICAL_INTERFACE}" "${VIRTUAL_INTERFACE}" address "${ADDRESS}" type macvlan mode bridge
ip link set "${PHYSICAL_INTERFACE}" address "${GENERATED_ADDRESS}"
ip link set "${PHYSICAL_INTERFACE}" up

11
config/udev/network-hotplug-rename
View File

@@ -57,16 +57,23 @@ ADDRESS="$(</sys/class/net/${INTERFACE}/address)"
for zone in ${ZONES}; do
address="${zone}_MACADDR"
device="${zone}_DEV"
mode="${zone}_MODE"
# Skip if address or device is unset
[ -n "${!address}" -a -n "${!device}" ] || continue
# Compare MAC addresses
[ "${ADDRESS}" = "${!address}" ] || continue
# If a matching interface has been found we will
# print the name to which udev will rename it.
if [ "${ADDRESS}" = "${!address}" ]; then
if [ "${!mode}" = "macvtap" ]; then
echo "${!device}phys"
else
echo "${!device}"
exit 0
fi
exit 0
done
# If we get here we have not found a matching device,

12
html/cgi-bin/logs.cgi/log.dat
View File

@@ -65,20 +65,22 @@ my %sections = (
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
'pakfire' => '(pakfire:) ',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
'squid' => '(squid\[.*\]: |squid: )',
'snort' => '(snort\[.*\]: )'
);
# Translations for the %sections array.
my %trsections = (
'ipfire' => 'IPFire',
'red' => 'RED',
'ddns' => $Lang::tr{'dynamic dns'},
'ddns' => "$Lang::tr{'dynamic dns'}",
'dns' => 'DNS',
'dma' => 'Mail',
'dhcp' => "$Lang::tr{'dhcp server'}",
'cron' => 'Cron',
'collectd' => 'Collectd',
'clamav' => 'ClamAV',
'clamav' => 'ClamAV',
'ntp' => 'NTP',
'ssh' => 'SSH',
'auth' => "$Lang::tr{'loginlogout'}",
@@ -86,7 +88,9 @@ my %trsections = (
'ipsec' => 'IPSec',
'openvpn' => 'OpenVPN',
'pakfire' => 'Pakfire',
'wireless' => 'Wireless'
'wireless' => 'Wireless',
'squid' => "$Lang::tr{'web proxy'}",
'snort' => "$Lang::tr{'intrusion detection'}"
);

20
lfs/automake
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 IPFire Team <info@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.12.4
VER = 1.15
THISAPP = automake-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
PREFIX = /usr
TARGET = $(DIR_INFO)/$(THISAPP)
else
PREFIX = /tools
TARGET = $(DIR_INFO)/$(THISAPP)-tools
endif
###############################################################################
# Top-level Rules
###############################################################################
@@ -40,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7395a0420ecb5c9bc43e5fcf4824df36
$(DL_FILE)_MD5 = 9a1ddb0e053474d9d1105cfe39b0c48d
install : $(TARGET)
@@ -70,7 +80,9 @@ $(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) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
--docdir=/usr/share/doc/automake-1.15
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

8
lfs/coreutils
View File

@@ -24,7 +24,7 @@
include Config
VER = 8.24
VER = 8.25
THISAPP = coreutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -42,7 +42,6 @@ else
endif
CONFIGURE_OPTIONS += \
--disable-selinux \
--enable-largefile \
--disable-rpath \
--enable-install-program=arch \
@@ -60,7 +59,7 @@ objects =$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 40efdbce865d2458d8da0a9dcee7c16c
$(DL_FILE)_MD5 = 070e43ba7f618d747414ef56ab248a48
install : $(TARGET)
@@ -90,7 +89,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-8.25-i18n-2.patch
cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 && ./configure $(CONFIGURE_OPTIONS)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

19
lfs/expect
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 IPFire Team <info@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,12 +24,12 @@
include Config
VER = 5.43.0
VER = 5.45
THISAPP = expect-$(VER)
THISAPP = expect$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/expect-5.43
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-tools
###############################################################################
@@ -40,7 +40,7 @@ objects=$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 43e1dc0e0bc9492cf2e1a6f59f276bc3
$(DL_FILE)_MD5 = 44e1a4f4c877e9ddc5a542dfa7ecc92b
install : $(TARGET)
@@ -70,8 +70,13 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch
cd $(DIR_APP) && ./configure --prefix=/tools --host=$(BUILDTARGET) --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
cd $(DIR_APP) && ./configure \
--prefix=/tools \
--build=$(BUILDTARGET) \
--with-tcl=/tools/lib \
--with-tclinclude=/tools/include \
--with-x=no \
--disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make SCRIPTS="" install
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl*

6
lfs/findutils
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 IPFire Team <info@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 = 4.4.2
VER = 4.6.0
THISAPP = findutils-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 351cc4adb07d54877fa15f75fb77d39f
$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1
install : $(TARGET)

2
lfs/gcc
View File

@@ -61,6 +61,8 @@ else
ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
CXXFLAGS := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS))
CXXFLAGS += -std=gnu++98
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
--target=$(CROSSTARGET) \

4
lfs/igmpproxy
View File

@@ -82,8 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igmpproxy-100-use-monotic-clock-instead-of-time-of-day.patch
cd $(DIR_APP) && autoreconf
cd $(DIR_APP) && ./configure --sysconfdir=/etc
cd $(DIR_APP) && aclocal && automake --add-missing && autoreconf
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \

83
lfs/libpciaccess Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@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 = 0.13.4
THISAPP = libpciaccess-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libpciaccess
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:.
$(PAK)
###############################################################################
# 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) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

95
lfs/libvirt Normal file
View File

@@ -0,0 +1,95 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@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.2.18.3
THISAPP = libvirt-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = libvirt
PAK_VER = 3
DEPS = "libpciaccess libyajl ncat qemu"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bcb0738ff66972ddb25cfe0d086c5c37
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:.
$(PAK)
###############################################################################
# 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/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
--with-openssl --without-sasl \
--without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \
--without-firewalld --without-network -with-interface --with-virtualport --with-macvtap \
--disable-nls --without-avahi --without-test-suite -without-dbus \
--with-qemu-user=nobody --with-qemu-group=kvm \
--with-storage-dir --without-storage-fs --without-storage-lvm --without-storage-iscsi \
--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
@rm -rf $(DIR_APP)
@$(POSTBUILD)

84
lfs/libyajl Normal file
View File

@@ -0,0 +1,84 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@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 = 2.1.0
THISAPP = libyajl-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libyajl
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 58c61232e1be991fd9a7ceecfc78836c
install: $(TARGET)
check: $(patsubst %,$(DIR_CHK)/%,$(objects))
download: $(patsubst %,$(DIR_DL)/%,$(objects))
md5: $(subst %,%_MD5,$(objects))
dist:
$(PAK)
###############################################################################
# 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) && cmake -DCMAKE_INSTALL_PREFIX=/usr .
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

62
lfs/ncurses
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.9
VER = 6.0
THISAPP = ncurses-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,17 +44,13 @@ endif
EXTRA_CONFIG += \
--prefix=$(PREFIX) \
--enable-widec \
--with-shared \
--without-debug \
--without-ada \
--with-ospeed=unsigned \
--with-chtype=long \
--enable-hard-tabs \
--enable-xmc-glitch \
--enable-colorfgbg \
--enable-overwrite \
--with-termlib=tinfo \
--disable-nls
--without-normal \
--enable-pc-files \
--disable-nls \
--mandir=/usr/share/man
###############################################################################
# Top-level Rules
@@ -64,7 +60,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
install : $(TARGET)
@@ -94,35 +90,27 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && mkdir -pv narrowc widec
# Don't install a static library
cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
# Create pkgconfig dir in toolchain
ifneq "$(ROOT)" ""
mkdir -pv /tools/lib/pkgconfig/
endif
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Build narrowc version.
cd $(DIR_APP)/narrowc && ln -svf ../configure .
cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
cd $(DIR_APP)/narrowc && make libs
cd $(DIR_APP)/narrowc && make -C progs
# Build widec version.
cd $(DIR_APP)/widec && ln -svf ../configure .
cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
--enable-widec --without-progs
cd $(DIR_APP)/widec && make libs
# Install everything.
cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
rm -vf $(PREFIX)/lib/libtinfo.*
cd $(DIR_APP) && make -C widec install.{libs,includes,man}
# don't require -ltinfo when linking with --no-add-needed
for l in $(PREFIX)/lib/libncurses{,w}.so; do \
soname=$$(basename $$(readlink $$l)); \
rm -f $$l; \
echo "INPUT($$soname -ltinfo)" > $$l; \
# allow the linker to find non-wide-character ncurses libraries
for lib in ncurses form panel menu; do \
rm -vf $(PREFIX)/lib/lib$${lib}.so; \
echo "INPUT(-l$${lib}w)" > $(PREFIX)/lib/lib$${lib}.so; \
ln -sfv $${lib}w.pc $(PREFIX)/lib/pkgconfig/$${lib}.pc; \
done
rm -vf $(PREFIX)/lib/libcurses{,w}.so
echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
# old applications that look for -lcurses at build time are still buildable
rm -vf /usr/lib/libcursesw.so
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
ln -sfv libncurses.so $(PREFIX)/lib/libcurses.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)

127
lfs/ncurses-compat Normal file
View File

@@ -0,0 +1,127 @@
###############################################################################
# #
# 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 = 5.9
THISAPP = ncurses-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
endif
EXTRA_CONFIG += \
--prefix=$(PREFIX) \
--with-shared \
--without-debug \
--without-ada \
--with-ospeed=unsigned \
--with-chtype=long \
--enable-hard-tabs \
--enable-xmc-glitch \
--enable-colorfgbg \
--enable-overwrite \
--with-termlib=tinfo \
--disable-nls
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
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) && mkdir -pv narrowc widec
# Build narrowc version.
cd $(DIR_APP)/narrowc && ln -svf ../configure .
cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
cd $(DIR_APP)/narrowc && make libs
cd $(DIR_APP)/narrowc && make -C progs
# Build widec version.
cd $(DIR_APP)/widec && ln -svf ../configure .
cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
--enable-widec --without-progs
cd $(DIR_APP)/widec && make libs
# Install everything.
cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
rm -vf $(PREFIX)/lib/libtinfo.*
cd $(DIR_APP) && make -C widec install.{libs,includes,man}
# don't require -ltinfo when linking with --no-add-needed
for l in $(PREFIX)/lib/libncurses{,w}.so; do \
soname=$$(basename $$(readlink $$l)); \
rm -f $$l; \
echo "INPUT($$soname -ltinfo)" > $$l; \
done
rm -vf $(PREFIX)/lib/libcurses{,w}.so
echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/ntp
View File

@@ -24,7 +24,7 @@
include Config
VER = 4.2.8p5
VER = 4.2.8p8
THISAPP = ntp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8
$(DL_FILE)_MD5 = 4a8636260435b230636f053ffd070e34
install : $(TARGET)

16
lfs/pkg-config
View File

@@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
endif
###############################################################################
# Top-level Rules
###############################################################################
@@ -70,7 +80,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib
ifeq "$(ROOT)" ""
else
mkdir /tools/lib/pkgconfig
endif
cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

4
lfs/qemu
View File

@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = qemu
PAK_VER = 18
PAK_VER = 19
DEPS = "sdl spice"
@@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
paxctl -m -r /usr/bin/qemu-arm
paxctl -m -r /usr/bin/qemu-i386
paxctl -m -r /usr/bin/qemu-x86_64
# install an udev script to set the permissions of /dev/kvm
cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/samba
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 62
PAK_VER = 63
DEPS = "cups krb5"
@@ -88,10 +88,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2118-v3-6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2015-5370-v3-6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
cd $(DIR_APP)/source3 && ./autogen.sh
cd $(DIR_APP)/source3 && ./configure \
--prefix=/usr \

23
lfs/shadow
View File

@@ -24,10 +24,10 @@
include Config
VER = 4.0.15
VER = 4.2.1
THISAPP = shadow-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8
install : $(TARGET)
@@ -69,11 +69,15 @@ $(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) && ./configure --libdir=/lib --enable-shared --without-selinux --disable-nls
cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile
cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {} \;
cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
cd $(DIR_APP) && ./configure --libdir=/lib \
--sysconfdir=/etc \
--enable-shared \
--without-selinux \
--disable-nls \
--with-group-name-max-length=32
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc
@@ -81,10 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-e 's@/var/spool/mail@/var/mail@' \
etc/login.defs > /etc/login.defs
mv -v /usr/bin/passwd /bin
mv -v /lib/libshadow.*a /usr/lib
rm -v /lib/libshadow.so
ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
mkdir -v /etc/default
touch /etc/shadow
chmod 600 /etc/shadow
pwconv

6
lfs/squid
View File

@@ -70,6 +70,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14051.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14052.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14053.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14054.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14055.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14056.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi

2
lfs/udev
View File

@@ -109,6 +109,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/lib/udev/network-hotplug-rename
install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-vlan \
/lib/udev/network-hotplug-vlan
install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-macvtap \
/lib/udev/network-hotplug-macvtap
install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
/lib/udev/rules.d

83
lfs/util-macros Normal file
View File

@@ -0,0 +1,83 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@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.19.0
THISAPP = util-macros-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = util-macros
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 40e1caa49a71a26e0aa68ddd00203717
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:.
$(PAK)
###############################################################################
# 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) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/wget
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 IPFire Team <info@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.16
VER = 1.18
THISAPP = wget-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = fe102975ab3a6c049777883f1bb9ad07
$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec
install : $(TARGET)

16
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
CORE="103" # Core Level (Filename)
PAKFIRE_CORE="102" # Core Level (PAKFIRE)
CORE="104" # Core Level (Filename)
PAKFIRE_CORE="103" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=11
TOOLCHAINVER=12
# New architecture variables
BUILD_ARCH="$(uname -m)"
@@ -294,6 +294,7 @@ buildtoolchain() {
lfsmake1 tcl
lfsmake1 expect
lfsmake1 dejagnu
lfsmake1 pkg-config
lfsmake1 ncurses
lfsmake1 bash
lfsmake1 bzip2
@@ -336,10 +337,13 @@ buildbase() {
lfsmake2 gcc
lfsmake2 sed
lfsmake2 berkeley
lfsmake2 autoconf
lfsmake2 automake
lfsmake2 coreutils
lfsmake2 iana-etc
lfsmake2 m4
lfsmake2 bison
lfsmake2 ncurses-compat
lfsmake2 ncurses
lfsmake2 procps
lfsmake2 libtool
@@ -348,8 +352,6 @@ buildbase() {
lfsmake2 readline-compat
lfsmake2 pcre
lfsmake2 pcre-compat
lfsmake2 autoconf
lfsmake2 automake
lfsmake2 bash
lfsmake2 bzip2
lfsmake2 diffutils
@@ -863,6 +865,10 @@ buildipfire() {
ipfiremake dmidecode
ipfiremake mcelog
ipfiremake rtpproxy
ipfiremake util-macros
ipfiremake libpciaccess
ipfiremake libyajl
ipfiremake libvirt
}
buildinstaller() {

49
src/initscripts/init.d/libvirtd Normal file
View File

@@ -0,0 +1,49 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/libvirtd
#
# Description : libvirtd init script
#
# Authors : Jonatan Schlag - jonatan.schlag@ipfire.org
#
# Version : 01.00
#
# Notes :
#
########################################################################
. /etc/sysconfig/rc
. $rc_functions
case $1 in
start)
boot_mesg "Load required kernel modules for Libvirt"
modprobe tun
evaluate_retval
boot_mesg "Starting Libvirt Daemon..."
loadproc /usr/sbin/libvirtd -d
;;
stop)
boot_mesg "Stopping Libvirt Daemon..."
killproc /usr/sbin/libvirtd
;;
restart)
$0 stop
sleep 1
$0 start
;;
status)
statusproc /usr/sbin/libvirtd
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/libvirtd

4
src/pakfire/lib/functions.sh
View File

@@ -86,7 +86,7 @@ start_service() {
esac
done
if [ -e "/etc/init.d/${1}" ]; then
if [ -f "/etc/init.d/${1}" ]; then
if [ -n "${BACKGROUND}" ]; then
(sleep ${DELAY} && /etc/init.d/${1} start) &
else
@@ -96,7 +96,7 @@ start_service() {
}
stop_service() {
if [ -e "/etc/init.d/${1}" ]; then
if [ -f "/etc/init.d/${1}" ]; then
/etc/init.d/${1} stop
fi
}

39
src/paks/libvirt/install.sh Normal file
View File

@@ -0,0 +1,39 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
# creates a new user and group called libvirt-remote if they not exist
getent group libvirt-remote >/dev/null || groupadd libvirt-remote
getent passwd libvirt-remote >/dev/null || \
useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote"
extract_files
start_service --delay 300 --background ${NAME}
ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd
ln -svf /etc/init.d/libvirtd /etc/rc.d/rc3.d/S70libvirtd
ln -svf /etc/init.d/libvirtd /etc/rc.d/rc6.d/K20libvirtd
ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc0.d/K19libvirt-guests
ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc3.d/S71libvirt-guests
ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc6.d/K19libvirt-guests

30
src/paks/libvirt/uninstall.sh Normal file
View File

@@ -0,0 +1,30 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
remove_files
rm -f /etc/rc.d/rc*.d/*libvirt-guests
rm -f /etc/rc.d/rc*.d/*libvirtd

27
src/paks/libvirt/update.sh Normal file
View File

@@ -0,0 +1,27 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire 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 2 of the License, or #
# (at your option) any later version. #
# #
# IPFire 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 IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh

2
src/paks/qemu/install.sh
View File

@@ -22,6 +22,8 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
#create the group kvm when they not exist
getent group kvm >/dev/null || groupadd kvm
extract_files
restore_backup ${NAME}
echo shm /dev/shm tmpfs defaults,size=256M 0 0 >> /etc/fstab

10
src/patches/automake-1.15_perl_warning.patch Normal file
View File

@@ -0,0 +1,10 @@
--- automake-1.15/bin/automake.in
+++ automake-1.15/bin/automake.in
@@ -3878,7 +3878,7 @@
sub substitute_ac_subst_variables
{
my ($text) = @_;
- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
return $text;
}

4790
src/patches/coreutils-8.25-i18n-2.patch Normal file
View File

File diff suppressed because it is too large Load Diff

217
src/patches/expect-5.43.0-spawn-1.patch
View File

@@ -1,217 +0,0 @@
Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
Date: 2003-10-05
Initial Package Version: 5.38
Origin: Redhat RPM (Patch by HJ Lu)
Description: NA
diff -uNr expect-5.38.orig/exp_chan.c expect-5.38/exp_chan.c
--- expect-5.38.orig/exp_chan.c 2002-02-12 13:00:55.000000000 +1100
+++ expect-5.38/exp_chan.c 2003-03-01 10:36:18.000000000 +1100
@@ -519,6 +519,7 @@
esPtr->buffer = Tcl_NewStringObj("",0);
Tcl_IncrRefCount(esPtr->buffer);
esPtr->umsize = exp_default_match_max;
+ esPtr->umsize_changed = exp_default_match_max_changed;
/* this will reallocate object with an appropriate sized buffer */
expAdjust(esPtr);
diff -uNr expect-5.38.orig/exp_command.h expect-5.38/exp_command.h
--- expect-5.38.orig/exp_command.h 2002-04-08 08:57:20.000000000 +1000
+++ expect-5.38/exp_command.h 2003-03-01 10:36:18.000000000 +1100
@@ -25,6 +25,7 @@
EXTERN char * exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
EXTERN int exp_default_match_max;
+EXTERN int exp_default_match_max_changed;
EXTERN int exp_default_parity;
EXTERN int exp_default_rm_nulls;
@@ -97,6 +98,7 @@
int msize; /* # of bytes that buffer can hold (max) */
int umsize; /* # of bytes (min) that is guaranteed to match */
/* this comes from match_max command */
+ int umsize_changed; /* is umsize changed by user? */
int printed; /* # of bytes written to stdout (if logging on) */
/* but not actually returned via a match yet */
int echoed; /* additional # of bytes (beyond "printed" above) */
diff -uNr expect-5.38.orig/expect.c expect-5.38/expect.c
--- expect-5.38.orig/expect.c 2002-04-08 09:00:33.000000000 +1000
+++ expect-5.38/expect.c 2003-03-01 10:36:18.000000000 +1100
@@ -41,8 +41,17 @@
#include "tcldbg.h"
#endif
+/* The initial length is 2000. We increment it by 2000. The maximum
+ is 8MB (0x800000). */
+#define EXP_MATCH_MAX 2000
+#define EXP_MATCH_INC 2000
+#define EXP_MATCH_STEP_LIMIT 0x700000
+#define EXP_MATCH_LIMIT 0x800000
+#define EXP_MATCH_LIMIT_QUOTE "0x800000"
+
/* initial length of strings that we can guarantee patterns can match */
-int exp_default_match_max = 2000;
+int exp_default_match_max = EXP_MATCH_MAX;
+int exp_default_match_max_changed = 0;
#define INIT_EXPECT_TIMEOUT_LIT "10" /* seconds */
#define INIT_EXPECT_TIMEOUT 10 /* seconds */
int exp_default_parity = TRUE;
@@ -1618,6 +1627,76 @@
return newsize;
}
+/* returns # of bytes until we see a newline at the end or EOF. */
+/*ARGSUSED*/
+static int
+expReadNewLine(interp,esPtr,save_flags) /* INTL */
+Tcl_Interp *interp;
+ExpState *esPtr;
+int save_flags;
+{
+ int size;
+ int exp_size;
+ int full_size;
+ int count;
+ char *str;
+
+ count = 0;
+ for (;;) {
+ exp_size = expSizeGet(esPtr);
+
+ /* When we reach the limit, we will only read one char at a
+ time. */
+ if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT)
+ size = TCL_UTF_MAX;
+ else
+ size = exp_size;
+
+ if (exp_size + TCL_UTF_MAX >= esPtr->msize) {
+ if (esPtr->umsize >= EXP_MATCH_LIMIT) {
+ expDiagLogU("WARNING: interact buffer is full. probably your program\r\n");
+ expDiagLogU("is not interactive or has a very long output line. The\r\n");
+ expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n");
+ expDiagLogU("Dumping first half of buffer in order to continue\r\n");
+ expDiagLogU("Recommend you enlarge the buffer.\r\n");
+ exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
+ return count;
+ }
+ else {
+ esPtr->umsize += EXP_MATCH_INC;
+ expAdjust(esPtr);
+ }
+ }
+
+ full_size = esPtr->msize - (size / TCL_UTF_MAX);
+ size = Tcl_ReadChars(esPtr->channel,
+ esPtr->buffer,
+ full_size,
+ 1 /* append */);
+ if (size > 0) {
+ count += size;
+ /* We try again if there are more to read and we haven't
+ seen a newline at the end. */
+ if (size == full_size) {
+ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
+ if (str[size - 1] != '\n')
+ continue;
+ }
+ }
+ else {
+ /* It is even trickier. We got an error from read. We have
+ to recover from it. Let's make sure the size of
+ buffer is correct. It can be corrupted. */
+ str = Tcl_GetString(esPtr->buffer);
+ Tcl_SetObjLength(esPtr->buffer, strlen(str));
+ }
+
+ break;
+ }
+
+ return count;
+}
+
/* returns # of bytes read or (non-positive) error of form EXP_XXX */
/* returns 0 for end of file */
/* If timeout is non-zero, set an alarm before doing the read, else assume */
@@ -1632,6 +1711,8 @@
{
int cc = EXP_TIMEOUT;
int size = expSizeGet(esPtr);
+ int full_size;
+ int count;
if (size + TCL_UTF_MAX >= esPtr->msize)
exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
@@ -1648,11 +1729,43 @@
}
#endif
-
+ /* FIXME: If we ask less than what is available in the tcl buffer
+ when tcl has seen EOF, we will throw away the remaining data
+ since the next read will get EOF. Since expect is line-oriented,
+ we exand our buffer to get EOF or the next newline at the end of
+ the input buffer. I don't know if it is the right fix. H.J. */
+ count = 0;
+ full_size = esPtr->msize - (size / TCL_UTF_MAX);
cc = Tcl_ReadChars(esPtr->channel,
- esPtr->buffer,
- esPtr->msize - (size / TCL_UTF_MAX),
- 1 /* append */);
+ esPtr->buffer,
+ full_size,
+ 1 /* append */);
+ if (cc > 0) {
+ count += cc;
+ /* It gets very tricky. There are more to read. We will expand
+ our buffer and get EOF or a newline at the end unless the
+ buffer length has been changed. */
+ if (cc == full_size) {
+ char *str;
+ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
+ if (str[size - 1] != '\n') {
+ if (esPtr->umsize_changed) {
+ char buf[20]; /* big enough for 64bit int in hex. */
+ snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize);
+ expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n");
+ expDiagLogU("all output. probably your program is not interactive or\r\n");
+ expDiagLogU("has a very long output line. The current limit is ");
+ expDiagLogU(buf);
+ expDiagLogU(".\r\n");
+ }
+ else {
+ cc = expReadNewLine(interp,esPtr,save_flags);
+ if (cc > 0)
+ count += cc;
+ }
+ }
+ }
+ }
i_read_errno = errno;
#ifdef SIMPLE_EVENT
@@ -1673,7 +1786,7 @@
}
}
#endif
- return cc;
+ return count > 0 ? count : cc;
}
/*
@@ -2746,8 +2859,14 @@
return(TCL_ERROR);
}
- if (Default) exp_default_match_max = size;
- else esPtr->umsize = size;
+ if (Default) {
+ exp_default_match_max = size;
+ exp_default_match_max_changed = 1;
+ }
+ else {
+ esPtr->umsize = size;
+ esPtr->umsize_changed = 1;
+ }
return(TCL_OK);
}

30
src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch Normal file
View File

@@ -0,0 +1,30 @@
From a50fa0195e36773d57593006152828ce2c0523fd Mon Sep 17 00:00:00 2001
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Fri, 6 May 2016 11:38:08 +0200
Subject: [PATCH] Change default behavior of libvirt-guests.sh for IPFire
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
tools/libvirt-guests.sh.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
index 7f74b85..87aceb7 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -30,9 +30,9 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions ||
export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@"
-URIS=default
-ON_BOOT=start
-ON_SHUTDOWN=suspend
+URIS=qemu:///system
+ON_BOOT=ignore
+ON_SHUTDOWN=shutdown
SHUTDOWN_TIMEOUT=300
PARALLEL_SHUTDOWN=0
START_DELAY=0
--
2.1.4

43
src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch Normal file
View File

@@ -0,0 +1,43 @@
From 69d6e8ce6c636f78d1db0eebe7fb1cc02ae4fb9a Mon Sep 17 00:00:00 2001
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Mon, 6 Jun 2016 19:40:50 +0200
Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
daemon/libvirtd.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index ac06cdd..1a41914 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -87,14 +87,14 @@
# without becoming root.
#
# This is restricted to 'root' by default.
-#unix_sock_group = "libvirt"
+unix_sock_group = "libvirt-remote"
# Set the UNIX socket permissions for the R/O socket. This is used
# for monitoring VM status only
#
# Default allows any user. If setting group ownership, you may want to
# restrict this too.
-#unix_sock_ro_perms = "0777"
+unix_sock_ro_perms = "0770"
# Set the UNIX socket permissions for the R/W socket. This is used
# for full management of VMs
@@ -104,7 +104,7 @@
#
# If not using PolicyKit and setting group ownership for access
# control, then you may want to relax this too.
-#unix_sock_rw_perms = "0770"
+unix_sock_rw_perms = "0770"
# Set the UNIX socket permissions for the admin interface socket.
#
--
2.1.4

39
src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
View File

@@ -1,39 +0,0 @@
From 82fa625540abf8b8ec23d43c41e2ca906a9928a5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 15 Apr 2016 11:56:08 +0200
Subject: [PATCH] s3:rpc_server: Fix a regression verifying the security
trailer
We do not support header signing so we should not check verify it if a
client sends the flag.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---
source3/rpc_server/srv_pipe.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index d659705..fa354a6 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1552,7 +1552,6 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
{
TALLOC_CTX *frame = talloc_stackframe();
struct dcerpc_sec_verification_trailer *vt = NULL;
- const uint32_t bitmask1 = 0;
const struct dcerpc_sec_vt_pcontext pcontext = {
.abstract_syntax = pipe_fns->syntax,
.transfer_syntax = ndr_transfer_syntax,
@@ -1573,7 +1572,7 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
goto done;
}
- ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
+ ret = dcerpc_sec_verification_trailer_check(vt, NULL,
&pcontext, &header2);
done:
TALLOC_FREE(frame);
--
1.9.1

40
src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
View File

@@ -1,40 +0,0 @@
From 0abef6992dc342d443137f8a2ac6c01f490cecee Mon Sep 17 00:00:00 2001
From: Christian Ambach <ambi@samba.org>
Date: Wed, 20 Feb 2013 16:59:05 +0100
Subject: [PATCH] s3:rpc_client fix a crash
state->cli->dc does not have to be set (e.g. when running
net rpc join against an older Samba PDC), so check it before dereferencing it
This fixes Bug 9669 - net rpc join crashes against a Samba 3.0.33 PDC
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9669
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Wed Feb 20 19:00:52 CET 2013 on sn-devel-104
(cherry picked from commit 3d29bb2d37b02909ecb500e864f3c13e06957a86)
(cherry picked from commit ff658bb36c28c9db91fc80a68725e893ffe300aa)
---
source3/rpc_client/cli_pipe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 5ddabb7..a211d92 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2136,7 +2136,7 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
TALLOC_FREE(subreq);
if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
- if (state->cli->dc->negotiate_flags &
+ if (state->cli->dc && state->cli->dc->negotiate_flags &
NETLOGON_NEG_SUPPORTS_AES) {
DEBUG(5, ("AES is not supported and the error was %s\n",
nt_errstr(status)));
--
1.9.1

58
src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
View File

@@ -1,58 +0,0 @@
From 2d0424e7bb2c30bf9049529b207c73b55370dfc8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 10 Jan 2012 16:38:16 +0100
Subject: [PATCH] s3-rpc_client: Fix updating netlogon credentials.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 33206b1e240e55acedad606aed4f1952f7496b35)
---
source3/rpc_client/cli_pipe.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index a211d92..92ca494 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2128,9 +2128,6 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
struct rpc_pipe_bind_state *state =
tevent_req_data(req,
struct rpc_pipe_bind_state);
- struct schannel_state *schannel_auth =
- talloc_get_type_abort(state->cli->auth->auth_ctx,
- struct schannel_state);
NTSTATUS status;
status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
@@ -2188,8 +2185,8 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
return;
}
- TALLOC_FREE(schannel_auth->creds);
- schannel_auth->creds = talloc_steal(state->cli, state->creds);
+ TALLOC_FREE(state->cli->dc);
+ state->cli->dc = talloc_steal(state->cli, state->creds);
if (!NT_STATUS_IS_OK(state->r.out.result)) {
DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
@@ -3385,10 +3382,12 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
* The credentials on a new netlogon pipe are the ones we are passed
* in - copy them over
*/
- result->dc = netlogon_creds_copy(result, *pdc);
if (result->dc == NULL) {
- TALLOC_FREE(result);
- return NT_STATUS_NO_MEMORY;
+ result->dc = netlogon_creds_copy(result, *pdc);
+ if (result->dc == NULL) {
+ TALLOC_FREE(result);
+ return NT_STATUS_NO_MEMORY;
+ }
}
DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
--
1.9.1

156
src/patches/samba/CVE-preparation-v3-6.patch
View File

@@ -1,7 +1,7 @@
From 39a3fa39967faaf216be8e108ca57d07de1aa95a Mon Sep 17 00:00:00 2001
From: Vadim Zhukov <persgray@gmail.com>
Date: Sat, 25 May 2013 15:19:24 +0100
Subject: [PATCH 01/41] pidl: Recent Perl warns about "defined(@var)"
Subject: [PATCH 01/44] pidl: Recent Perl warns about "defined(@var)"
constructs.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
@@ -1170,7 +1170,7 @@ Index: samba-3.6.23/source3/Makefile.in
- lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
+ ../lib/util/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
lib/wins_srv.o \
lib/util_str.o lib/clobber.o lib/util_sid.o \
lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_specialsids.o \
lib/util_unistr.o ../lib/util/charset/codepoints.o lib/util_file.o \
@@ -988,7 +989,9 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(P
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
@@ -2376,7 +2376,7 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
case DCERPC_AUTH_TYPE_NTLMSSP:
case DCERPC_AUTH_TYPE_SPNEGO:
case DCERPC_AUTH_TYPE_KRB5:
@@ -1869,6 +2068,153 @@ err_out:
@@ -1869,6 +2068,150 @@ err_out:
tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
}
@@ -2440,15 +2440,12 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
+ struct rpc_pipe_bind_state *state =
+ tevent_req_data(req,
+ struct rpc_pipe_bind_state);
+ struct schannel_state *schannel_auth =
+ talloc_get_type_abort(state->cli->auth->auth_ctx,
+ struct schannel_state);
+ NTSTATUS status;
+
+ status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
+ TALLOC_FREE(subreq);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
+ if (state->cli->dc->negotiate_flags &
+ if (state->cli->dc && state->cli->dc->negotiate_flags &
+ NETLOGON_NEG_SUPPORTS_AES) {
+ DEBUG(5, ("AES is not supported and the error was %s\n",
+ nt_errstr(status)));
@@ -2500,8 +2497,8 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
+ return;
+ }
+
+ TALLOC_FREE(schannel_auth->creds);
+ schannel_auth->creds = talloc_steal(state->cli, state->creds);
+ TALLOC_FREE(state->cli->dc);
+ state->cli->dc = talloc_steal(state->cli, state->creds);
+
+ if (!NT_STATUS_IS_OK(state->r.out.result)) {
+ DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
@@ -2530,6 +2527,22 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
static NTSTATUS rpc_bind_next_send(struct tevent_req *req,
struct rpc_pipe_bind_state *state,
DATA_BLOB *auth_token)
@@ -3039,10 +3382,12 @@ NTSTATUS cli_rpc_pipe_open_schannel_with
* The credentials on a new netlogon pipe are the ones we are passed
* in - copy them over
*/
- result->dc = netlogon_creds_copy(result, *pdc);
if (result->dc == NULL) {
- TALLOC_FREE(result);
- return NT_STATUS_NO_MEMORY;
+ result->dc = netlogon_creds_copy(result, *pdc);
+ if (result->dc == NULL) {
+ TALLOC_FREE(result);
+ return NT_STATUS_NO_MEMORY;
+ }
}
DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
Index: samba-3.6.23/source3/librpc/rpc/dcerpc.h
===================================================================
--- samba-3.6.23.orig/source3/librpc/rpc/dcerpc.h
@@ -3688,7 +3701,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
/* add to the list of open contexts */
@@ -1541,7 +1543,42 @@ static PIPE_RPC_FNS* find_pipe_fns_by_co
@@ -1541,7 +1543,41 @@ static PIPE_RPC_FNS* find_pipe_fns_by_co
}
static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
@@ -3702,7 +3715,6 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
+{
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct dcerpc_sec_verification_trailer *vt = NULL;
+ const uint32_t bitmask1 = 0;
+ const struct dcerpc_sec_vt_pcontext pcontext = {
+ .abstract_syntax = pipe_fns->syntax,
+ .transfer_syntax = ndr_transfer_syntax,
@@ -3723,7 +3735,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
+ goto done;
+ }
+
+ ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
+ ret = dcerpc_sec_verification_trailer_check(vt, NULL,
+ &pcontext, &header2);
+done:
+ TALLOC_FREE(frame);
@@ -3732,7 +3744,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
/****************************************************************************
Find the correct RPC function to call for this request.
@@ -1552,46 +1589,53 @@ static bool api_rpcTNP(struct pipes_stru
@@ -1552,46 +1588,53 @@ static bool api_rpcTNP(struct pipes_stru
static bool api_pipe_request(struct pipes_struct *p,
struct ncacn_packet *pkt)
{
@@ -3811,7 +3823,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
return ret;
}
@@ -1600,20 +1644,21 @@ static bool api_pipe_request(struct pipe
@@ -1600,20 +1643,21 @@ static bool api_pipe_request(struct pipe
********************************************************************/
static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
@@ -3836,7 +3848,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
dump_pdu_region(name, pkt->u.request.opnum,
&p->in_data.data, 0,
p->in_data.data.length);
@@ -1646,37 +1691,30 @@ static bool api_rpcTNP(struct pipes_stru
@@ -1646,37 +1690,30 @@ static bool api_rpcTNP(struct pipes_stru
/* do the actual command */
if(!api_rpc_cmds[fn_num].fn(p)) {
DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
@@ -3882,7 +3894,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
/* Check for buffer underflow in rpc parsing */
if ((DEBUGLEVEL >= 10) &&
@@ -1718,9 +1756,9 @@ void set_incoming_fault(struct pipes_str
@@ -1718,9 +1755,9 @@ void set_incoming_fault(struct pipes_str
data_blob_free(&p->in_data.data);
p->in_data.pdu_needed_len = 0;
p->in_data.pdu.length = 0;
@@ -5626,7 +5638,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
===================================================================
--- samba-3.6.23.orig/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -10201,7 +10201,7 @@ WERROR _spoolss_AddPort(struct pipes_str
@@ -10207,7 +10207,7 @@ WERROR _spoolss_AddPort(struct pipes_str
WERROR _spoolss_GetPrinterDriver(struct pipes_struct *p,
struct spoolss_GetPrinterDriver *r)
{
@@ -5635,7 +5647,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10212,7 +10212,7 @@ WERROR _spoolss_GetPrinterDriver(struct
@@ -10218,7 +10218,7 @@ WERROR _spoolss_GetPrinterDriver(struct
WERROR _spoolss_ReadPrinter(struct pipes_struct *p,
struct spoolss_ReadPrinter *r)
{
@@ -5644,7 +5656,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10223,7 +10223,7 @@ WERROR _spoolss_ReadPrinter(struct pipes
@@ -10229,7 +10229,7 @@ WERROR _spoolss_ReadPrinter(struct pipes
WERROR _spoolss_WaitForPrinterChange(struct pipes_struct *p,
struct spoolss_WaitForPrinterChange *r)
{
@@ -5653,7 +5665,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10234,7 +10234,7 @@ WERROR _spoolss_WaitForPrinterChange(str
@@ -10240,7 +10240,7 @@ WERROR _spoolss_WaitForPrinterChange(str
WERROR _spoolss_ConfigurePort(struct pipes_struct *p,
struct spoolss_ConfigurePort *r)
{
@@ -5662,7 +5674,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10245,7 +10245,7 @@ WERROR _spoolss_ConfigurePort(struct pip
@@ -10251,7 +10251,7 @@ WERROR _spoolss_ConfigurePort(struct pip
WERROR _spoolss_DeletePort(struct pipes_struct *p,
struct spoolss_DeletePort *r)
{
@@ -5671,7 +5683,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10256,7 +10256,7 @@ WERROR _spoolss_DeletePort(struct pipes_
@@ -10262,7 +10262,7 @@ WERROR _spoolss_DeletePort(struct pipes_
WERROR _spoolss_CreatePrinterIC(struct pipes_struct *p,
struct spoolss_CreatePrinterIC *r)
{
@@ -5680,7 +5692,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10267,7 +10267,7 @@ WERROR _spoolss_CreatePrinterIC(struct p
@@ -10273,7 +10273,7 @@ WERROR _spoolss_CreatePrinterIC(struct p
WERROR _spoolss_PlayGDIScriptOnPrinterIC(struct pipes_struct *p,
struct spoolss_PlayGDIScriptOnPrinterIC *r)
{
@@ -5689,7 +5701,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10278,7 +10278,7 @@ WERROR _spoolss_PlayGDIScriptOnPrinterIC
@@ -10284,7 +10284,7 @@ WERROR _spoolss_PlayGDIScriptOnPrinterIC
WERROR _spoolss_DeletePrinterIC(struct pipes_struct *p,
struct spoolss_DeletePrinterIC *r)
{
@@ -5698,7 +5710,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10289,7 +10289,7 @@ WERROR _spoolss_DeletePrinterIC(struct p
@@ -10295,7 +10295,7 @@ WERROR _spoolss_DeletePrinterIC(struct p
WERROR _spoolss_AddPrinterConnection(struct pipes_struct *p,
struct spoolss_AddPrinterConnection *r)
{
@@ -5707,7 +5719,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10300,7 +10300,7 @@ WERROR _spoolss_AddPrinterConnection(str
@@ -10306,7 +10306,7 @@ WERROR _spoolss_AddPrinterConnection(str
WERROR _spoolss_DeletePrinterConnection(struct pipes_struct *p,
struct spoolss_DeletePrinterConnection *r)
{
@@ -5716,7 +5728,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10311,7 +10311,7 @@ WERROR _spoolss_DeletePrinterConnection(
@@ -10317,7 +10317,7 @@ WERROR _spoolss_DeletePrinterConnection(
WERROR _spoolss_PrinterMessageBox(struct pipes_struct *p,
struct spoolss_PrinterMessageBox *r)
{
@@ -5725,7 +5737,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10322,7 +10322,7 @@ WERROR _spoolss_PrinterMessageBox(struct
@@ -10328,7 +10328,7 @@ WERROR _spoolss_PrinterMessageBox(struct
WERROR _spoolss_AddMonitor(struct pipes_struct *p,
struct spoolss_AddMonitor *r)
{
@@ -5734,7 +5746,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10333,7 +10333,7 @@ WERROR _spoolss_AddMonitor(struct pipes_
@@ -10339,7 +10339,7 @@ WERROR _spoolss_AddMonitor(struct pipes_
WERROR _spoolss_DeleteMonitor(struct pipes_struct *p,
struct spoolss_DeleteMonitor *r)
{
@@ -5743,7 +5755,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10344,7 +10344,7 @@ WERROR _spoolss_DeleteMonitor(struct pip
@@ -10350,7 +10350,7 @@ WERROR _spoolss_DeleteMonitor(struct pip
WERROR _spoolss_DeletePrintProcessor(struct pipes_struct *p,
struct spoolss_DeletePrintProcessor *r)
{
@@ -5752,7 +5764,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10355,7 +10355,7 @@ WERROR _spoolss_DeletePrintProcessor(str
@@ -10361,7 +10361,7 @@ WERROR _spoolss_DeletePrintProcessor(str
WERROR _spoolss_AddPrintProvidor(struct pipes_struct *p,
struct spoolss_AddPrintProvidor *r)
{
@@ -5761,7 +5773,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10366,7 +10366,7 @@ WERROR _spoolss_AddPrintProvidor(struct
@@ -10372,7 +10372,7 @@ WERROR _spoolss_AddPrintProvidor(struct
WERROR _spoolss_DeletePrintProvidor(struct pipes_struct *p,
struct spoolss_DeletePrintProvidor *r)
{
@@ -5770,7 +5782,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10377,7 +10377,7 @@ WERROR _spoolss_DeletePrintProvidor(stru
@@ -10383,7 +10383,7 @@ WERROR _spoolss_DeletePrintProvidor(stru
WERROR _spoolss_FindFirstPrinterChangeNotification(struct pipes_struct *p,
struct spoolss_FindFirstPrinterChangeNotification *r)
{
@@ -5779,7 +5791,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10388,7 +10388,7 @@ WERROR _spoolss_FindFirstPrinterChangeNo
@@ -10394,7 +10394,7 @@ WERROR _spoolss_FindFirstPrinterChangeNo
WERROR _spoolss_FindNextPrinterChangeNotification(struct pipes_struct *p,
struct spoolss_FindNextPrinterChangeNotification *r)
{
@@ -5788,7 +5800,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10399,7 +10399,7 @@ WERROR _spoolss_FindNextPrinterChangeNot
@@ -10405,7 +10405,7 @@ WERROR _spoolss_FindNextPrinterChangeNot
WERROR _spoolss_RouterFindFirstPrinterChangeNotificationOld(struct pipes_struct *p,
struct spoolss_RouterFindFirstPrinterChangeNotificationOld *r)
{
@@ -5797,7 +5809,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10410,7 +10410,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
@@ -10416,7 +10416,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
WERROR _spoolss_ReplyOpenPrinter(struct pipes_struct *p,
struct spoolss_ReplyOpenPrinter *r)
{
@@ -5806,7 +5818,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10421,7 +10421,7 @@ WERROR _spoolss_ReplyOpenPrinter(struct
@@ -10427,7 +10427,7 @@ WERROR _spoolss_ReplyOpenPrinter(struct
WERROR _spoolss_RouterReplyPrinter(struct pipes_struct *p,
struct spoolss_RouterReplyPrinter *r)
{
@@ -5815,7 +5827,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10432,7 +10432,7 @@ WERROR _spoolss_RouterReplyPrinter(struc
@@ -10438,7 +10438,7 @@ WERROR _spoolss_RouterReplyPrinter(struc
WERROR _spoolss_ReplyClosePrinter(struct pipes_struct *p,
struct spoolss_ReplyClosePrinter *r)
{
@@ -5824,7 +5836,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10443,7 +10443,7 @@ WERROR _spoolss_ReplyClosePrinter(struct
@@ -10449,7 +10449,7 @@ WERROR _spoolss_ReplyClosePrinter(struct
WERROR _spoolss_AddPortEx(struct pipes_struct *p,
struct spoolss_AddPortEx *r)
{
@@ -5833,7 +5845,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10454,7 +10454,7 @@ WERROR _spoolss_AddPortEx(struct pipes_s
@@ -10460,7 +10460,7 @@ WERROR _spoolss_AddPortEx(struct pipes_s
WERROR _spoolss_RouterFindFirstPrinterChangeNotification(struct pipes_struct *p,
struct spoolss_RouterFindFirstPrinterChangeNotification *r)
{
@@ -5842,7 +5854,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10465,7 +10465,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
@@ -10471,7 +10471,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
WERROR _spoolss_SpoolerInit(struct pipes_struct *p,
struct spoolss_SpoolerInit *r)
{
@@ -5851,7 +5863,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10476,7 +10476,7 @@ WERROR _spoolss_SpoolerInit(struct pipes
@@ -10482,7 +10482,7 @@ WERROR _spoolss_SpoolerInit(struct pipes
WERROR _spoolss_ResetPrinterEx(struct pipes_struct *p,
struct spoolss_ResetPrinterEx *r)
{
@@ -5860,7 +5872,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10487,7 +10487,7 @@ WERROR _spoolss_ResetPrinterEx(struct pi
@@ -10493,7 +10493,7 @@ WERROR _spoolss_ResetPrinterEx(struct pi
WERROR _spoolss_RouterReplyPrinterEx(struct pipes_struct *p,
struct spoolss_RouterReplyPrinterEx *r)
{
@@ -5869,7 +5881,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10498,7 +10498,7 @@ WERROR _spoolss_RouterReplyPrinterEx(str
@@ -10504,7 +10504,7 @@ WERROR _spoolss_RouterReplyPrinterEx(str
WERROR _spoolss_44(struct pipes_struct *p,
struct spoolss_44 *r)
{
@@ -5878,7 +5890,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10509,7 +10509,7 @@ WERROR _spoolss_44(struct pipes_struct *
@@ -10515,7 +10515,7 @@ WERROR _spoolss_44(struct pipes_struct *
WERROR _spoolss_SetPort(struct pipes_struct *p,
struct spoolss_SetPort *r)
{
@@ -5887,7 +5899,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10520,7 +10520,7 @@ WERROR _spoolss_SetPort(struct pipes_str
@@ -10526,7 +10526,7 @@ WERROR _spoolss_SetPort(struct pipes_str
WERROR _spoolss_4a(struct pipes_struct *p,
struct spoolss_4a *r)
{
@@ -5896,7 +5908,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10531,7 +10531,7 @@ WERROR _spoolss_4a(struct pipes_struct *
@@ -10537,7 +10537,7 @@ WERROR _spoolss_4a(struct pipes_struct *
WERROR _spoolss_4b(struct pipes_struct *p,
struct spoolss_4b *r)
{
@@ -5905,7 +5917,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10542,7 +10542,7 @@ WERROR _spoolss_4b(struct pipes_struct *
@@ -10548,7 +10548,7 @@ WERROR _spoolss_4b(struct pipes_struct *
WERROR _spoolss_4c(struct pipes_struct *p,
struct spoolss_4c *r)
{
@@ -5914,7 +5926,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10553,7 +10553,7 @@ WERROR _spoolss_4c(struct pipes_struct *
@@ -10559,7 +10559,7 @@ WERROR _spoolss_4c(struct pipes_struct *
WERROR _spoolss_53(struct pipes_struct *p,
struct spoolss_53 *r)
{
@@ -5923,7 +5935,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10564,7 +10564,7 @@ WERROR _spoolss_53(struct pipes_struct *
@@ -10570,7 +10570,7 @@ WERROR _spoolss_53(struct pipes_struct *
WERROR _spoolss_AddPerMachineConnection(struct pipes_struct *p,
struct spoolss_AddPerMachineConnection *r)
{
@@ -5932,7 +5944,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10575,7 +10575,7 @@ WERROR _spoolss_AddPerMachineConnection(
@@ -10581,7 +10581,7 @@ WERROR _spoolss_AddPerMachineConnection(
WERROR _spoolss_DeletePerMachineConnection(struct pipes_struct *p,
struct spoolss_DeletePerMachineConnection *r)
{
@@ -5941,7 +5953,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10586,7 +10586,7 @@ WERROR _spoolss_DeletePerMachineConnecti
@@ -10592,7 +10592,7 @@ WERROR _spoolss_DeletePerMachineConnecti
WERROR _spoolss_EnumPerMachineConnections(struct pipes_struct *p,
struct spoolss_EnumPerMachineConnections *r)
{
@@ -5950,7 +5962,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10597,7 +10597,7 @@ WERROR _spoolss_EnumPerMachineConnection
@@ -10603,7 +10603,7 @@ WERROR _spoolss_EnumPerMachineConnection
WERROR _spoolss_5a(struct pipes_struct *p,
struct spoolss_5a *r)
{
@@ -5959,7 +5971,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10608,7 +10608,7 @@ WERROR _spoolss_5a(struct pipes_struct *
@@ -10614,7 +10614,7 @@ WERROR _spoolss_5a(struct pipes_struct *
WERROR _spoolss_5b(struct pipes_struct *p,
struct spoolss_5b *r)
{
@@ -5968,7 +5980,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10619,7 +10619,7 @@ WERROR _spoolss_5b(struct pipes_struct *
@@ -10625,7 +10625,7 @@ WERROR _spoolss_5b(struct pipes_struct *
WERROR _spoolss_5c(struct pipes_struct *p,
struct spoolss_5c *r)
{
@@ -5977,7 +5989,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10630,7 +10630,7 @@ WERROR _spoolss_5c(struct pipes_struct *
@@ -10636,7 +10636,7 @@ WERROR _spoolss_5c(struct pipes_struct *
WERROR _spoolss_5d(struct pipes_struct *p,
struct spoolss_5d *r)
{
@@ -5986,7 +5998,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10641,7 +10641,7 @@ WERROR _spoolss_5d(struct pipes_struct *
@@ -10647,7 +10647,7 @@ WERROR _spoolss_5d(struct pipes_struct *
WERROR _spoolss_5e(struct pipes_struct *p,
struct spoolss_5e *r)
{
@@ -5995,7 +6007,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10652,7 +10652,7 @@ WERROR _spoolss_5e(struct pipes_struct *
@@ -10658,7 +10658,7 @@ WERROR _spoolss_5e(struct pipes_struct *
WERROR _spoolss_5f(struct pipes_struct *p,
struct spoolss_5f *r)
{
@@ -6004,7 +6016,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10663,7 +10663,7 @@ WERROR _spoolss_5f(struct pipes_struct *
@@ -10669,7 +10669,7 @@ WERROR _spoolss_5f(struct pipes_struct *
WERROR _spoolss_60(struct pipes_struct *p,
struct spoolss_60 *r)
{
@@ -6013,7 +6025,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10674,7 +10674,7 @@ WERROR _spoolss_60(struct pipes_struct *
@@ -10680,7 +10680,7 @@ WERROR _spoolss_60(struct pipes_struct *
WERROR _spoolss_61(struct pipes_struct *p,
struct spoolss_61 *r)
{
@@ -6022,7 +6034,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10685,7 +10685,7 @@ WERROR _spoolss_61(struct pipes_struct *
@@ -10691,7 +10691,7 @@ WERROR _spoolss_61(struct pipes_struct *
WERROR _spoolss_62(struct pipes_struct *p,
struct spoolss_62 *r)
{
@@ -6031,7 +6043,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10696,7 +10696,7 @@ WERROR _spoolss_62(struct pipes_struct *
@@ -10702,7 +10702,7 @@ WERROR _spoolss_62(struct pipes_struct *
WERROR _spoolss_63(struct pipes_struct *p,
struct spoolss_63 *r)
{
@@ -6040,7 +6052,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10707,7 +10707,7 @@ WERROR _spoolss_63(struct pipes_struct *
@@ -10713,7 +10713,7 @@ WERROR _spoolss_63(struct pipes_struct *
WERROR _spoolss_64(struct pipes_struct *p,
struct spoolss_64 *r)
{
@@ -6049,7 +6061,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10718,7 +10718,7 @@ WERROR _spoolss_64(struct pipes_struct *
@@ -10724,7 +10724,7 @@ WERROR _spoolss_64(struct pipes_struct *
WERROR _spoolss_65(struct pipes_struct *p,
struct spoolss_65 *r)
{
@@ -6058,7 +6070,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10729,7 +10729,7 @@ WERROR _spoolss_65(struct pipes_struct *
@@ -10735,7 +10735,7 @@ WERROR _spoolss_65(struct pipes_struct *
WERROR _spoolss_GetCorePrinterDrivers(struct pipes_struct *p,
struct spoolss_GetCorePrinterDrivers *r)
{
@@ -6067,7 +6079,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10740,7 +10740,7 @@ WERROR _spoolss_GetCorePrinterDrivers(st
@@ -10746,7 +10746,7 @@ WERROR _spoolss_GetCorePrinterDrivers(st
WERROR _spoolss_67(struct pipes_struct *p,
struct spoolss_67 *r)
{
@@ -6076,7 +6088,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10751,7 +10751,7 @@ WERROR _spoolss_67(struct pipes_struct *
@@ -10757,7 +10757,7 @@ WERROR _spoolss_67(struct pipes_struct *
WERROR _spoolss_GetPrinterDriverPackagePath(struct pipes_struct *p,
struct spoolss_GetPrinterDriverPackagePath *r)
{
@@ -6085,7 +6097,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10762,7 +10762,7 @@ WERROR _spoolss_GetPrinterDriverPackageP
@@ -10768,7 +10768,7 @@ WERROR _spoolss_GetPrinterDriverPackageP
WERROR _spoolss_69(struct pipes_struct *p,
struct spoolss_69 *r)
{
@@ -6094,7 +6106,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10773,7 +10773,7 @@ WERROR _spoolss_69(struct pipes_struct *
@@ -10779,7 +10779,7 @@ WERROR _spoolss_69(struct pipes_struct *
WERROR _spoolss_6a(struct pipes_struct *p,
struct spoolss_6a *r)
{
@@ -6103,7 +6115,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10784,7 +10784,7 @@ WERROR _spoolss_6a(struct pipes_struct *
@@ -10790,7 +10790,7 @@ WERROR _spoolss_6a(struct pipes_struct *
WERROR _spoolss_6b(struct pipes_struct *p,
struct spoolss_6b *r)
{
@@ -6112,7 +6124,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10795,7 +10795,7 @@ WERROR _spoolss_6b(struct pipes_struct *
@@ -10801,7 +10801,7 @@ WERROR _spoolss_6b(struct pipes_struct *
WERROR _spoolss_6c(struct pipes_struct *p,
struct spoolss_6c *r)
{
@@ -6121,7 +6133,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
return WERR_NOT_SUPPORTED;
}
@@ -10806,6 +10806,6 @@ WERROR _spoolss_6c(struct pipes_struct *
@@ -10812,6 +10812,6 @@ WERROR _spoolss_6c(struct pipes_struct *
WERROR _spoolss_6d(struct pipes_struct *p,
struct spoolss_6d *r)
{

38
src/patches/shadow-4.2.1-SHA512_password_hashing.patch Normal file
View File

@@ -0,0 +1,38 @@
diff -crB shadow-4.2.1-a/etc/login.defs shadow-4.2.1-b/etc/login.defs
*** shadow-4.2.1-a/etc/login.defs 2014-05-09 10:20:28.000000000 +0000
--- shadow-4.2.1-b/etc/login.defs 2016-03-13 10:51:09.680171239 +0000
***************
*** 118,124 ****
# Directory where mailboxes reside, _or_ name of file, relative to the
# home directory. If you _do_ define both, MAIL_DIR takes precedence.
#
! MAIL_DIR /var/spool/mail
#MAIL_FILE .mail
#
--- 118,124 ----
# Directory where mailboxes reside, _or_ name of file, relative to the
# home directory. If you _do_ define both, MAIL_DIR takes precedence.
#
! MAIL_DIR /var/mail
#MAIL_FILE .mail
#
***************
*** 317,323 ****
# Note: If you use PAM, it is recommended to use a value consistent with
# the PAM modules configuration.
#
! #ENCRYPT_METHOD DES
#
# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
--- 317,323 ----
# Note: If you use PAM, it is recommended to use a value consistent with
# the PAM modules configuration.
#
! ENCRYPT_METHOD SHA512
#
# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
Only in shadow-4.2.1-b: SHA512_password_hashing.patch

446
src/patches/shadow-4.2.1-suppress_installation_of_groups.patch Normal file
View File

@@ -0,0 +1,446 @@
diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in
*** shadow-4.2.1-a/man/cs/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/cs/Makefile.in 2016-03-13 10:47:55.924166976 +0000
***************
*** 300,311 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man1/groups.1 \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/nologin.8 \
! man5/passwd.5 \
man5/shadow.5 \
man1/su.1 \
man8/vipw.8
--- 300,311 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man1/ \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/nologin.8 \
! man5/ \
man5/shadow.5 \
man1/su.1 \
man8/vipw.8
diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in
*** shadow-4.2.1-a/man/da/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/da/Makefile.in 2016-03-13 10:47:55.928166977 +0000
***************
*** 298,304 ****
top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages
! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam =
--- 298,304 ----
top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages
! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam =
diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in
*** shadow-4.2.1-a/man/de/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/de/Makefile.in 2016-03-13 10:47:55.916166976 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in
*** shadow-4.2.1-a/man/es/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/es/Makefile.in 2016-03-13 10:47:55.872166975 +0000
***************
*** 266,272 ****
# man1/login.1 \
# man1/newgrp.1 \
# man1/passwd.1 \
! # man5/passwd.5 \
# man1/su.1 \
# man8/vigr.8 \
# man8/vipw.8
--- 266,272 ----
# man1/login.1 \
# man1/newgrp.1 \
# man1/passwd.1 \
! # man5/ \
# man1/su.1 \
# man8/vigr.8 \
# man8/vipw.8
diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in
*** shadow-4.2.1-a/man/fr/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/fr/Makefile.in 2016-03-13 10:47:55.984166978 +0000
***************
*** 301,311 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 301,311 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in
*** shadow-4.2.1-a/man/hu/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/hu/Makefile.in 2016-03-13 10:47:55.972166978 +0000
***************
*** 295,306 ****
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
! man1/groups.1 \
man8/lastlog.8 \
man1/login.1 \
man1/newgrp.1 \
man1/passwd.1 \
! man5/passwd.5 \
man1/sg.1 \
man1/su.1
--- 295,306 ----
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
! man1/ \
man8/lastlog.8 \
man1/login.1 \
man1/newgrp.1 \
man1/passwd.1 \
! man5/ \
man1/sg.1 \
man1/su.1
diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in
*** shadow-4.2.1-a/man/it/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/it/Makefile.in 2016-03-13 10:47:55.896166976 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in
*** shadow-4.2.1-a/man/ja/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ja/Makefile.in 2016-03-13 10:47:55.932166977 +0000
***************
*** 296,305 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
--- 296,305 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in
*** shadow-4.2.1-a/man/ko/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ko/Makefile.in 2016-03-13 10:47:55.940166977 +0000
***************
*** 295,303 ****
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
! man1/groups.1 \
man1/login.1 \
! man5/passwd.5 \
man1/su.1 \
man8/vigr.8 \
man8/vipw.8
--- 295,303 ----
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
! man1/ \
man1/login.1 \
! man5/ \
man1/su.1 \
man8/vigr.8 \
man8/vipw.8
diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in
*** shadow-4.2.1-a/man/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/Makefile.in 2016-03-13 10:47:55.880166976 +0000
***************
*** 365,375 ****
@USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 365,375 ----
@USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in
*** shadow-4.2.1-a/man/pl/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/pl/Makefile.in 2016-03-13 10:47:55.912166976 +0000
***************
*** 300,307 ****
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1)
--- 300,307 ----
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1)
diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-b/man/pt_BR/Makefile.in
*** shadow-4.2.1-a/man/pt_BR/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/pt_BR/Makefile.in 2016-03-13 10:47:55.904166976 +0000
***************
*** 297,303 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/passwd.5 \
man5/shadow.5
EXTRA_DIST = $(man_MANS)
--- 297,303 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/ \
man5/shadow.5
EXTRA_DIST = $(man_MANS)
diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in
*** shadow-4.2.1-a/man/ru/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ru/Makefile.in 2016-03-13 10:47:55.944166977 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in
*** shadow-4.2.1-a/man/sv/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/sv/Makefile.in 2016-03-13 10:47:55.988166978 +0000
***************
*** 300,309 ****
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
! man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \
--- 300,309 ----
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
! man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \
diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in
*** shadow-4.2.1-a/man/tr/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/tr/Makefile.in 2016-03-13 10:47:55.964166977 +0000
***************
*** 300,306 ****
man8/groupmod.8 \
man1/login.1 \
man1/passwd.1 \
! man5/passwd.5 \
man5/shadow.5 \
man1/su.1 \
man8/useradd.8 \
--- 300,306 ----
man8/groupmod.8 \
man1/login.1 \
man1/passwd.1 \
! man5/ \
man5/shadow.5 \
man1/su.1 \
man8/useradd.8 \
diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-b/man/zh_CN/Makefile.in
*** shadow-4.2.1-a/man/zh_CN/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/zh_CN/Makefile.in 2016-03-13 10:47:55.952166977 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-b/man/zh_TW/Makefile.in
*** shadow-4.2.1-a/man/zh_TW/Makefile.in 2014-05-09 16:49:48.000000000 +0000
--- shadow-4.2.1-b/man/zh_TW/Makefile.in 2016-03-13 10:47:55.956166977 +0000
***************
*** 302,308 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/passwd.5 \
man1/su.1 \
man8/useradd.8 \
man8/userdel.8 \
--- 302,308 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/ \
man1/su.1 \
man8/useradd.8 \
man8/userdel.8 \
diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in
*** shadow-4.2.1-a/src/Makefile.in 2014-05-09 16:49:48.000000000 +0000
--- shadow-4.2.1-b/src/Makefile.in 2016-03-13 10:47:38.824166600 +0000
***************
*** 78,84 ****
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT)
sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
--- 78,84 ----
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT)
sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \

63
src/patches/squid/squid-3.5-14051.patch Normal file
View File

@@ -0,0 +1,63 @@
------------------------------------------------------------
revno: 14051
revision-id: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
parent: squid3@treenet.co.nz-20160508124125-fytgvn68zppfr8ix
author: Steve Hill <steve@opendium.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Wed 2016-05-18 02:58:50 +1200
message:
Support unified EUI format code in external_acl_type
Squid supports %>eui as a logformat specifier, which produces an EUI-48
for IPv4 clients and an EUI-64 for IPv6 clients. However, This is not
allowed as a format specifier for the external ACLs, and you have to use
%SRCEUI48 and %SRCEUI64 instead. %SRCEUI48 is only useful for IPv4
clients and %SRCEUI64 is only useful for IPv6 clients, so supporting
both v4 and v6 is a bit messy.
Adds the %>eui specifier for external ACLs and behaves in the same way
as the logformat specifier.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: ad0743717948a65cfd4f306acc2bbaa9343e9a76
# timestamp: 2016-05-17 15:50:54 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160508124125-\
# fytgvn68zppfr8ix
#
# Begin patch
=== modified file 'src/external_acl.cc'
--- src/external_acl.cc 2016-01-01 00:14:27 +0000
+++ src/external_acl.cc 2016-05-17 14:58:50 +0000
@@ -356,6 +356,8 @@
else if (strcmp(token, "%SRCPORT") == 0 || strcmp(token, "%>p") == 0)
format->type = Format::LFT_CLIENT_PORT;
#if USE_SQUID_EUI
+ else if (strcmp(token, "%>eui") == 0)
+ format->type = Format::LFT_CLIENT_EUI;
else if (strcmp(token, "%SRCEUI48") == 0)
format->type = Format::LFT_EXT_ACL_CLIENT_EUI48;
else if (strcmp(token, "%SRCEUI64") == 0)
@@ -944,6 +946,18 @@
break;
#if USE_SQUID_EUI
+ case Format::LFT_CLIENT_EUI:
+ // TODO make the ACL checklist have a direct link to any TCP details.
+ if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL)
+ {
+ if (request->clientConnectionManager->clientConnection->remote.isIPv4())
+ request->clientConnectionManager->clientConnection->remoteEui48.encode(buf, sizeof(buf));
+ else
+ request->clientConnectionManager->clientConnection->remoteEui64.encode(buf, sizeof(buf));
+ str = buf;
+ }
+ break;
+
case Format::LFT_EXT_ACL_CLIENT_EUI48:
if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL &&
request->clientConnectionManager->clientConnection->remoteEui48.encode(buf, sizeof(buf)))

34
src/patches/squid/squid-3.5-14052.patch Normal file
View File

@@ -0,0 +1,34 @@
------------------------------------------------------------
revno: 14052
revision-id: squidadm@squid-cache.org-20160517181416-sfrjdosd9dhx7u8o
parent: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
committer: Source Maintenance <squidadm@squid-cache.org>
branch nick: 3.5
timestamp: Tue 2016-05-17 18:14:16 +0000
message:
SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20160517181416-\
# sfrjdosd9dhx7u8o
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: e30c12805cacdb559925da08cc6a25fe4a39c19b
# timestamp: 2016-05-17 18:51:06 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160517145850-\
# uos9z00nrt7xd9ik
#
# Begin patch
=== modified file 'src/external_acl.cc'
--- src/external_acl.cc 2016-05-17 14:58:50 +0000
+++ src/external_acl.cc 2016-05-17 18:14:16 +0000
@@ -956,7 +956,7 @@
request->clientConnectionManager->clientConnection->remoteEui64.encode(buf, sizeof(buf));
str = buf;
}
- break;
+ break;
case Format::LFT_EXT_ACL_CLIENT_EUI48:
if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL &&

46
src/patches/squid/squid-3.5-14053.patch Normal file
View File

@@ -0,0 +1,46 @@
------------------------------------------------------------
revno: 14053
revision-id: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
parent: squidadm@squid-cache.org-20160517181416-sfrjdosd9dhx7u8o
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sun 2016-05-22 01:00:58 +1200
message:
Do not override user defined -std option
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: a75245a622ccfa385ef5e4722f9a9fb438a16135
# timestamp: 2016-05-21 13:08:06 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squidadm@squid-cache.org-20160517181416-\
# sfrjdosd9dhx7u8o
#
# Begin patch
=== modified file 'configure.ac'
--- configure.ac 2016-05-08 12:41:25 +0000
+++ configure.ac 2016-05-21 13:00:58 +0000
@@ -95,6 +95,9 @@
# Guess the compiler type (sets squid_cv_compiler)
SQUID_CC_GUESS_VARIANT
+# If the user did not specify a C++ version.
+user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "\-std="`
+if test "x$user_cxx" = "x"; then
# Check for C++11 compiler support
#
# BUG 3613: when clang -std=c++0x is used, it activates a "strict mode"
@@ -103,8 +106,9 @@
#
# Similar POSIX issues on MinGW 32-bit and Cygwin
#
-if ! test "x$squid_host_os" = "xmingw" -o "x$squid_host_os" = "xcygwin" -o "x$squid_cv_compiler" = "xclang"; then
- AX_CXX_COMPILE_STDCXX_11([noext],[optional])
+ if ! test "x$squid_host_os" = "xmingw" -o "x$squid_host_os" = "xcygwin" -o "x$squid_cv_compiler" = "xclang"; then
+ AX_CXX_COMPILE_STDCXX_11([noext],[optional])
+ fi
fi
# test for programs

37
src/patches/squid/squid-3.5-14054.patch Normal file
View File

@@ -0,0 +1,37 @@
------------------------------------------------------------
revno: 14054
revision-id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
parent: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sun 2016-05-22 01:01:44 +1200
message:
Fix OpenSSL detection on FreeBSD
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 3d8c0d7a9f1886523ac55d79e4d3e8f0340e2ec9
# timestamp: 2016-05-21 13:08:08 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160521130058-\
# zq8zugw0fohwfu3z
#
# Begin patch
=== modified file 'configure.ac'
--- configure.ac 2016-05-21 13:00:58 +0000
+++ configure.ac 2016-05-21 13:01:44 +0000
@@ -1348,10 +1348,10 @@
AC_CHECK_LIB(crypto,[CRYPTO_new_ex_data],[LIBOPENSSL_LIBS="-lcrypto $LIBOPENSSL_LIBS"],[
AC_MSG_ERROR([library 'crypto' is required for OpenSSL])
- ])
+ ],$LIBOPENSSL_LIBS)
AC_CHECK_LIB(ssl,[SSL_library_init],[LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"],[
AC_MSG_ERROR([library 'ssl' is required for OpenSSL])
- ])
+ ],$LIBOPENSSL_LIBS)
])
# This is a workaround for RedHat 9 brain damage..

39
src/patches/squid/squid-3.5-14055.patch Normal file
View File

@@ -0,0 +1,39 @@
------------------------------------------------------------
revno: 14055
revision-id: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
parent: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
author: Alex Rousskov <rousskov@measurement-factory.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sun 2016-05-22 03:52:02 +1200
message:
Fix icons loading speed.
Since trunk r14100 (Bug 3875: bad mimeLoadIconFile error handling), each
icon was read from disk and written to Store one character at a time. I
did not measure startup delays in production, but in debugging runs,
fixing this bug sped up icons loading from 1 minute to 4 seconds.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 79b78480d81666c15406d23837608ba9a578da4b
# timestamp: 2016-05-21 16:51:00 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160521130144-\
# 6xtcayieij00fm5v
#
# Begin patch
=== modified file 'src/mime.cc'
--- src/mime.cc 2016-01-01 00:14:27 +0000
+++ src/mime.cc 2016-05-21 15:52:02 +0000
@@ -430,7 +430,7 @@
/* read the file into the buffer and append it to store */
int n;
char *buf = (char *)memAllocate(MEM_4K_BUF);
- while ((n = FD_READ_METHOD(fd, buf, sizeof(*buf))) > 0)
+ while ((n = FD_READ_METHOD(fd, buf, 4096)) > 0)
e->append(buf, n);
file_close(fd);

36
src/patches/squid/squid-3.5-14056.patch Normal file
View File

@@ -0,0 +1,36 @@
------------------------------------------------------------
revno: 14056
revision-id: squid3@treenet.co.nz-20160521172919-du6cbdirqcxdjbtr
parent: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
author: Christos Tsantilas <chtsanti@users.sourceforge.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Sun 2016-05-22 05:29:19 +1200
message:
Increase debug level in a peek-and-splice related debug message
It may produced one debugging line for each SSL transaction in some cases
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160521172919-du6cbdirqcxdjbtr
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 76c2e864289dabb1065c470c954f9fc5ec4c7b4f
# timestamp: 2016-05-21 17:50:54 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160521155202-\
# pp53utwamdhkugvg
#
# Begin patch
=== modified file 'src/ssl/PeerConnector.cc'
--- src/ssl/PeerConnector.cc 2016-02-15 11:29:50 +0000
+++ src/ssl/PeerConnector.cc 2016-05-21 17:29:19 +0000
@@ -598,7 +598,7 @@
case SSL_ERROR_WANT_WRITE:
if ((srvBio->bumpMode() == Ssl::bumpPeek || srvBio->bumpMode() == Ssl::bumpStare) && srvBio->holdWrite()) {
- debugs(81, DBG_IMPORTANT, "hold write on SSL connection on FD " << fd);
+ debugs(81, 3, "hold write on SSL connection on FD " << fd);
checkForPeekAndSplice();
return;
}

2
tools/check_strings.pl
View File

@@ -36,7 +36,7 @@ require "${basedir}/langs/$lang/cgi-bin/$lang.pl";
sub wanted {
if ( -f $File::Find::name && open(FILE, $File::Find::name)) {
while (<FILE>) {
while ($_ =~ /\$Lang::tr{'([A-Za-z0-9,:_\s\/\.-]+)'}/g) {
while ($_ =~ /\$Lang::tr\{'([A-Za-z0-9,:_\s\/\.-]+)'\}/g) {
$tr2{$1} = 'empty string';
}
}