Menu
▾
▴
devil-linux-commit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(202) |
Nov
(201) |
Dec
(280) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(493) |
Feb
(106) |
Mar
(215) |
Apr
(163) |
May
(79) |
Jun
(193) |
Jul
(47) |
Aug
(71) |
Sep
(127) |
Oct
(41) |
Nov
(49) |
Dec
(120) |
| 2005 |
Jan
(147) |
Feb
(45) |
Mar
(26) |
Apr
(71) |
May
(52) |
Jun
(28) |
Jul
(92) |
Aug
(50) |
Sep
(35) |
Oct
(193) |
Nov
(106) |
Dec
(52) |
| 2006 |
Jan
(51) |
Feb
(38) |
Mar
(33) |
Apr
(79) |
May
(107) |
Jun
(67) |
Jul
(21) |
Aug
(65) |
Sep
(44) |
Oct
(87) |
Nov
(12) |
Dec
(56) |
| 2007 |
Jan
(48) |
Feb
(58) |
Mar
(63) |
Apr
(31) |
May
(25) |
Jun
(20) |
Jul
(72) |
Aug
(54) |
Sep
(30) |
Oct
(76) |
Nov
(74) |
Dec
(25) |
| 2008 |
Jan
(39) |
Feb
(39) |
Mar
(62) |
Apr
(64) |
May
(59) |
Jun
(31) |
Jul
(25) |
Aug
(25) |
Sep
(17) |
Oct
(24) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(60) |
Feb
(39) |
Mar
(16) |
Apr
(30) |
May
(52) |
Jun
(35) |
Jul
(15) |
Aug
(15) |
Sep
(21) |
Oct
(32) |
Nov
(39) |
Dec
(52) |
| 2010 |
Jan
(42) |
Feb
(40) |
Mar
(23) |
Apr
(20) |
May
(27) |
Jun
(10) |
Jul
(30) |
Aug
(30) |
Sep
(66) |
Oct
(12) |
Nov
(35) |
Dec
(60) |
| 2011 |
Jan
(16) |
Feb
(1) |
Mar
(3) |
Apr
(28) |
May
(21) |
Jun
|
Jul
(12) |
Aug
(6) |
Sep
(10) |
Oct
(14) |
Nov
(40) |
Dec
(60) |
| 2012 |
Jan
(23) |
Feb
(17) |
Mar
(24) |
Apr
(18) |
May
(13) |
Jun
(1) |
Jul
|
Aug
(5) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(15) |
| 2013 |
Jan
(2) |
Feb
(5) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2014 |
Jan
(3) |
Feb
(5) |
Mar
(8) |
Apr
(3) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(4) |
Oct
(10) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(18) |
Feb
(17) |
Mar
(5) |
Apr
(2) |
May
|
Jun
(5) |
Jul
(1) |
Aug
(2) |
Sep
(1) |
Oct
(24) |
Nov
(20) |
Dec
(41) |
| 2016 |
Jan
(9) |
Feb
(3) |
Mar
(2) |
Apr
(7) |
May
(8) |
Jun
(1) |
Jul
(6) |
Aug
(5) |
Sep
(2) |
Oct
(6) |
Nov
(1) |
Dec
(6) |
| 2017 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Heiko Z. <smi...@us...> - 2015-12-19 14:51:17
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23429 Modified Files: Python Log Message: porting pax setting from new paxctld Index: Python =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Python,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Python 24 Feb 2015 00:36:38 -0000 1.37 +++ Python 19 Dec 2015 14:51:15 -0000 1.38 @@ -36,6 +36,12 @@ # we need to install it, because Python-LDAP needs it make install || exit 1 + + if [ "$CONFIG_GRSECURITY" = "y" ] ; then + # let's make sure python works properly + paxctl -mE $CDDIR/usr/bin/python + fi + fi #exit 1 ;; @@ -61,7 +67,7 @@ if [ "$CONFIG_GRSECURITY" = "y" ] ; then # otherwise sagator won't work with the new clamav - paxctl -m $CDDIR/usr/bin/python + paxctl -mE $CDDIR/usr/bin/python fi fi ;; |
|
From: Heiko Z. <smi...@us...> - 2015-12-19 14:29:42
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22680 Modified Files: Makefile.build Log Message: libxml2 sometimes fails to compile. hopefully this will resolve the dependency issue Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- Makefile.build 12 Dec 2015 22:39:50 -0000 1.96 +++ Makefile.build 19 Dec 2015 14:29:40 -0000 1.97 @@ -31,10 +31,10 @@ tcp_wrappers which libdaemon \ gzip xz keyutils libmnl cmake libecap -GROUP_13b := bash +GROUP_13b := bash libxml2 GROUP_14 := Linux-PAM acl gmp gnupg libdnet \ - libdvdread libgcrypt libmcrypt libpng libxml2 \ + libdvdread libgcrypt libmcrypt libpng \ openssl ptlib tiff daq nettle p11-kit libffi libbsd libtasn1 GROUP_15 := gd glib gnutls krb5 \ @@ -245,7 +245,7 @@ libpng: | $(GROUP_13b) -libxml2: | $(GROUP_13b) +libxml2: | $(GROUP_13) openssl: | $(GROUP_13b) |
|
From: Heiko Z. <smi...@us...> - 2015-12-17 22:30:07
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27050 Modified Files: md5sum.lst Log Message: updated zoneminder and python Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.771 retrieving revision 1.772 diff -u -d -r1.771 -r1.772 --- md5sum.lst 13 Dec 2015 14:43:42 -0000 1.771 +++ md5sum.lst 17 Dec 2015 22:30:04 -0000 1.772 @@ -10,8 +10,8 @@ 8c103ebf7f9b19d3f419dfda99c6a934 src/MailScanner-4.85.2-3.tar.xz 9f647fb7400197e2648a0e04b8340df4 src/MySQL-python-1.2.2.tar.xz 590028292b8d97d6d15ace169747b489 src/Pound-2.7.tar.xz -c685ef0b8e9f27b5e3db5db12b268ac6 src/Python-2.7.10.tar.xz -287c8d855eb5b656d377a945716c9e73 src/ZoneMinder-git-20151024.tar.xz +1dbcc848b4cd8399a8199d000f9f823c src/Python-2.7.11.tar.xz +aa8839bb948a4dcfd27739ddbe677066 src/ZoneMinder-git-20151217.tar.xz 9708a812aade56d05b5f1f60be309395 src/acl-2.2.52.src.tar.xz 9dcf3a47d1c49eb47395125b09d1b20a src/aiccu_20070115.tar.xz 5c950e965f565a6925e5c7b9e64df31d src/aoe6-78-linux32-compat.patch.xz |
|
From: Heiko Z. <smi...@us...> - 2015-12-17 21:39:42
|
Update of /cvsroot/devil-linux/build/scripts/configuration/profiles In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24963 Modified Files: default server Log Message: enabled heartbeat in default config Index: default =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v retrieving revision 1.148 retrieving revision 1.149 diff -u -d -r1.148 -r1.149 --- default 11 Dec 2015 23:13:16 -0000 1.148 +++ default 17 Dec 2015 21:39:39 -0000 1.149 @@ -54,7 +54,7 @@ CONFIG_GOCR=y CONFIG_GPM=y CONFIG_GRSECURITY=y -CONFIG_HEARTBEAT=n +CONFIG_HEARTBEAT=y CONFIG_HOTPLUG=y CONFIG_HTTPD=y CONFIG_HTTPD_CACHE=y Index: server =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/server,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- server 11 Dec 2015 23:13:16 -0000 1.61 +++ server 17 Dec 2015 21:39:39 -0000 1.62 @@ -54,7 +54,7 @@ CONFIG_GOCR=y CONFIG_GPM=y CONFIG_GRSECURITY=n -CONFIG_HEARTBEAT=n +CONFIG_HEARTBEAT=y CONFIG_HOTPLUG=y CONFIG_HTTPD=y CONFIG_HTTPD_CACHE=y |
|
From: Heiko Z. <smi...@us...> - 2015-12-13 14:43:44
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28136 Modified Files: md5sum.lst Log Message: updated shellinabox and bacula Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.770 retrieving revision 1.771 diff -u -d -r1.770 -r1.771 --- md5sum.lst 12 Dec 2015 22:39:50 -0000 1.770 +++ md5sum.lst 13 Dec 2015 14:43:42 -0000 1.771 @@ -26,7 +26,7 @@ 42354858bcd957769a3092a774210bc7 src/avahi-0.6.31.tar.xz 2555bcab6c3f60d79d986c920463119d src/awstats-7.4.tar.xz e2a116b966c9ed5f769d0d71504db6e9 src/backports.ssl_match_hostname-3.4.0.2.tar.xz -6ea1ad922ae71ddeffdc20c20c8d7dd1 src/bacula-5.2.13.tar.xz +fa4c643e54112a7fd2abba2eb561cc14 src/bacula-7.2.0.tar.xz 2595801cecbaf3ccae0a64b1907f46b9 src/bash-4.3.30.tar.xz bda1715509276fb6db8df1daa62798a8 src/bash-patches.tar.xz f0d169fe05f10e8d3f8b449d8e1f28c1 src/bc-1.06.tar.xz @@ -847,8 +847,7 @@ 59f140a85ca84c74d01bae5d6e672d99 src/setuptools-12.0.4.tar.xz 79c8e3c0b2e4bad7dcba3e1ab090f3b4 src/sg3_utils-1.41.tar.xz 2bfafe7d4962682d31b5eba65dba4fc8 src/shadow-4.2.1.tar.xz -7821698e26acdba0b67b6c952ba58186 src/shellinabox-2.14-ff15.patch.xz -1c71dcb19975da8233d420e07df6adff src/shellinabox-2.14.tar.xz +183f70675238777c1a1a25c4c73adb14 src/shellinabox-v2.19.tar.xz 8372dc5dd6418bb367dd8301d456095d src/shorewall-4.6.13.1.tar.xz 4bcaf647e695e3898147055ce602ae27 src/shorewall-core-4.6.13.1.tar.xz 450eb0572a62b0ab790fd3efbe7eb919 src/sipcalc-1.1.5.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-12-12 22:39:53
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18243/scripts/scripts Modified Files: heartbeat ldirectord Log Message: final fixes for getting heartbeat to work Index: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/heartbeat,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- heartbeat 12 Dec 2015 21:52:00 -0000 1.7 +++ heartbeat 12 Dec 2015 22:39:51 -0000 1.8 @@ -44,6 +44,22 @@ # Default-Stop: 0 1 6 ### END INIT INFO +# settings +source /etc/sysconfig/config + +# parameters +CONFIGNAME=HEARTBEAT + +eval START=\$START_$CONFIGNAME + +# Determine the base and follow a runlevel link name. +base=${0##*/} +link=${base#*[SK][0-9][0-9]} + +# Force execution if not called by a runlevel directory. +test $link = $base && START=yes +test "$START" = "yes" || exit 0 + test -r /lib/lsb/init-functions && . /lib/lsb/init-functions HEARTBEAT=/usr/libexec/heartbeat/heartbeat Index: ldirectord =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/ldirectord,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ldirectord 10 Mar 2006 01:46:03 -0000 1.2 +++ ldirectord 12 Dec 2015 22:39:51 -0000 1.3 @@ -2,9 +2,10 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf +# Normally ldirectord is started and stopped by heartbeat # # processname: ldirectord # config: /etc/ha.d/ldirectord.cf @@ -15,7 +16,8 @@ # ### BEGIN INIT INFO # Provides: ldirectord -# Required-Start: $syslog $network +# Required-Start: $syslog $network $remote_fs +# Required-Stop: $syslog $network $remote_fs # Should-Start: $time sshd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 @@ -50,23 +52,22 @@ [ -f /etc/rc.d/init.d/functions ] then . /etc/rc.d/init.d/functions -else - function action { - echo -n "$1... " - shift - $@ - stat=$? - if [ $stat = 0 ]; then - echo success - else - echo failure - fi - return $stat - } fi [ -x $DAEMON ] || exit 0 +action() { + echo -n "$1... " + shift + $@ + stat=$? + if [ $stat = 0 ]; then + echo success + else + echo failure + fi + return $stat +} ###################################################################### # Read arument and take action as appropriate @@ -75,9 +76,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart |
|
From: Heiko Z. <smi...@us...> - 2015-12-12 21:52:30
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15444 Modified Files: Makefile.build Makefile.install md5sum.lst Log Message: iptables needs kmod binaries in /sbin updating heartbeat to the latest version and adding required dependencies Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- Makefile.build 4 Dec 2015 00:59:54 -0000 1.94 +++ Makefile.build 12 Dec 2015 21:51:57 -0000 1.95 @@ -41,7 +41,7 @@ libnetfilter_conntrack libxslt mcrypt mysql h323plus \ neon tz Pound libconfig libnetfilter_cttimeout \ libnetfilter_cthelper libnetfilter_queue libmspack xerces-c \ - xml-security-c check libidn rpcbind libtirpc gss + xml-security-c check libidn rpcbind libtirpc gss libnftnl GROUP_16 := util-linux gawk groff coreutils grep gperf file \ usbutils udev libusb libusb-compat pciutils @@ -119,7 +119,7 @@ GROUP_X := git pymilter GeoIP avahi cifs-utils kmod pwauth mod_authnz_external mod_authz_unixgroup \ shellinabox pam-abl mod_spdy netatalk opendkim backports.ssl_match_hostname certifi futures \ - pycurl html5lib GateOne ZoneMinder intltool v4l dovecot-pigeonhole + pycurl html5lib GateOne ZoneMinder intltool v4l dovecot-pigeonhole cluster-glue # End of dependencies @@ -733,9 +733,9 @@ cyrus-imapd: | $(GROUP_22) -heartbeat: | $(GROUP_22) +heartbeat: | $(GROUP_22) cluster-glue -iptables: | $(GROUP_17) +iptables: | $(GROUP_17) libnftnl iscsitarget: | $(GROUP_22) @@ -880,3 +880,7 @@ v4l: | linux udev dovecot-pigeonhole: | dovecot Python + +cluster-glue: net-snmp Python + +libnftnl: | $(GROUP_14) libxslt Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.768 retrieving revision 1.769 diff -u -d -r1.768 -r1.769 --- md5sum.lst 27 Nov 2015 17:18:15 -0000 1.768 +++ md5sum.lst 12 Dec 2015 21:51:57 -0000 1.769 @@ -52,6 +52,7 @@ 65b37d0b7b95fa19af9e4c3a1f9524d1 src/cifs-utils-6.4.tar.xz e69137d017114b3a731defebb9a39e00 src/clamav-0.98.7.tar.xz f3a38dadfde3f7736553fb904a62aade src/cloog-0.18.3.tar.xz +9f827fe08140ea51d86f2409e287f858 src/cluster-glue-0a7add1d9996.tar.xz e6d75a35995b479e6bd39d520630615d src/cmake-2.8.7.tar.xz 606a20da2f722127b332ee93c77ec6b9 src/compartment-1.2-suse-patches.diff.xz 5f1b17e8d2028ed2f55c1ad974b35e66 src/compartment-1.2.tar.xz @@ -160,8 +161,7 @@ da981f86677d58a106496e68de6f8995 src/gzip-1.6.tar.xz bcff53656a888ee0710cadc4288d1d9b src/h323plus-v1_26_5.tar.xz a45c66965ec219178c83b10b4819d4a4 src/hdparm-9.48.tar.xz -37d1799afa091e09c9e6601c02d75532 src/heartbeat-2.1.4.tar.xz -c92bc0050f9368f8b1cae58ec70190b1 src/heartbeat-2.1.4_install_fix.patch.xz +2aefc5b791f338c79745b1f6287d2346 src/heartbeat-3.0.6.tar.xz 3bc365ec5b5267f5c114ced91dea0db6 src/heartbeat-poderror_ldirectord.patch.xz 21b6e061d0fba0464050a39025a66e74 src/heimdal-1.5.3.tar.xz 07e5bc13b45af39512450e9da5e2c791 src/hostap-utils-0.4.7.tar.xz @@ -183,9 +183,8 @@ da466efe29477fcc72dbdfced2c547b8 src/iperf-2.0.5.tar.xz 51c54cc3245eff451154938fbc0f64f5 src/iproute2-4.2.0.tar.xz 13195be068501a8c679d734059c25800 src/ipsec-tools-0.8.0.tar.xz -1952d5583e6bf747c9d6bc352042d47c src/ipset-6.25.1.tar.xz -0ed7f87f254f28842d556ba1298f34be src/iptables-1.4.10-imq.patch.xz -2132d521587f379508efc17dff316d75 src/iptables-1.4.21.tar.xz +17984cd7a38ed6294e4f852ceaf97ba1 src/ipset-6.27.tar.xz +491c4e6ad862b57e1e530901fd5e9a3b src/iptables-20151212.tar.xz 3e5be2ca82986660442c562946ea247d src/iptraf-3.0.0-vlan.diff.xz 17b21d66269b58e7b041d3eda05f4526 src/iptraf-3.0.0.tar.xz e976aedd396e6783f08291ce90fecf31 src/iptraf-add-devnames.diff.xz @@ -245,12 +244,13 @@ e2e3c6f3e2d9cd03febb64edbe364103 src/libnet-1.1.2.1.tar.xz caf3c82944407470474764592a671602 src/libnet-endianess-fix.diff.xz 21052db0597184f18536786b1fcfe5a6 src/libnet-shared.diff.xz -aa82a3d2732eb100545b9263c1755ece src/libnetfilter_conntrack-1.0.4.tar.xz +5212da2eee99a6fd4d5fd381759954b2 src/libnetfilter_conntrack-1.0.5.tar.xz c557072571eee2c989b077d591f19a3f src/libnetfilter_cthelper-1.0.0.tar.xz 07175e6777e24a8debb1764441729cb3 src/libnetfilter_cttimeout-1.0.0.tar.xz 69a2e0e537a7e83ddd22c0eb674ee9d0 src/libnetfilter_queue-1.0.2.tar.xz 7ffd8da337f771ff04d2cc2cbb5189b8 src/libnfnetlink-1.0.1.tar.xz a45f0c370635978c435a2f9f3fa13521 src/libnfsidmap-0.25.tar.xz +25e08d8c5614d407e1e20e4f8a34cd42 src/libnftnl-1.0.5.tar.xz 7bc7bf679cdb3e76639f233e38d0672b src/libnl-3.2.24.tar.xz 5c3a34309d8b98640827e5d0991a4015 src/libogg-1.3.2.tar.xz 40ec93e97909305f91ffbe4921aec52c src/libol-0.3.18.tar.xz @@ -265,7 +265,7 @@ b2ce3f6090413bf14b9d6371effbf1f8 src/libusb-compat-0.1.5.tar.xz a6bb3605c0bca6ecfbb13d60232df16b src/libusb-git-20150919.tar.xz 28cb28097c07a735d6af56e598e1c90f src/libvorbis-1.3.5.tar.xz -10f1c6e82f908fef2d7cf5b05c60c7d4 src/libxml2-sources-2.9.2.tar.xz +9a8b83dae853af839f27962f1443819c src/libxml2-sources-2.9.3.tar.xz 208eb2d6d1e013a8caa6a10f8edb15a9 src/libxslt-1.1.28.tar.xz 3d5ea06d767e2f35c999eeadafc76523 src/linux-4.2.tar.xz 3b6a8df3206bb306d259cf510bef3b7b src/lm_sensors-3.4.0.tar.xz Index: Makefile.install =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.install,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- Makefile.install 7 Nov 2015 21:11:02 -0000 1.52 +++ Makefile.install 12 Dec 2015 21:51:57 -0000 1.53 @@ -109,7 +109,7 @@ GROUP_X := git pymilter GeoIP avahi cifs-utils pwauth mod_authnz_external mod_authz_unixgroup \ shellinabox pam-abl mod_spdy netatalk backports.ssl_match_hostname certifi futures \ - pycurl setuptools html5lib GateOne ZoneMinder kmod dovecot-pigeonhole + pycurl setuptools html5lib GateOne ZoneMinder kmod dovecot-pigeonhole cluster-glue # End of dependencies @@ -652,7 +652,7 @@ cyrus-imapd: | $(GROUP_22) -heartbeat: | $(GROUP_22) +heartbeat: | $(GROUP_22) cluster-glue iptables: | $(GROUP_22) @@ -769,3 +769,5 @@ kmod: | $(GROUP_16) dovecot-pigeonhole: | dovecot Python + +cluster-glue: | Python net-snmp |
|
From: Heiko Z. <smi...@us...> - 2015-12-12 21:52:03
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15444/scripts/scripts Modified Files: heartbeat Added Files: logd Log Message: iptables needs kmod binaries in /sbin updating heartbeat to the latest version and adding required dependencies Index: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/heartbeat,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- heartbeat 14 May 2008 14:10:50 -0000 1.6 +++ heartbeat 12 Dec 2015 21:52:00 -0000 1.7 @@ -1,6 +1,5 @@ #!/bin/sh # -# $Id$ # # heartbeat Start high-availability services # @@ -13,12 +12,13 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 75 05 +# chkconfig: - 75 05 # description: Startup script high-availability services. # processname: heartbeat # pidfile: /var/run/heartbeat.pid # config: /etc/ha.d/ha.cf # + ### BEGIN INIT INFO # Description: heartbeat is a basic high-availability subsystem. # It will start services at initialization, and when machines go up @@ -32,33 +32,25 @@ # - UDP/IP multicast (ethernet, etc) # - Unicast heartbeats # - "ping" heartbeats (for routers, switches, etc.) -# (to be used for breaking ties in 2-node systems +# (to be used for breaking ties in 2-node systems # and monitoring networking availability) -# # Short-Description: High-availability services. -# Provides: heartbeat HA -# Required-Start: $network $time $syslog -# Should-Start: xntpd -# Required-Stop: $network $time $syslog -# Default-Start: 3 5 -# Default-Stop: 0 6 +# Provides: heartbeat HA +# Required-Start: $remote_fs $network $time $syslog +# Should-Start: openhpid +# Required-Stop: $remote_fs $network $time $syslog +# Should-Stop: openhpid +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 ### END INIT INFO -# settings -source /etc/sysconfig/config - -# parameters -CONFIGNAME=HEARTBEAT - -eval START=\$START_$CONFIGNAME +test -r /lib/lsb/init-functions && . /lib/lsb/init-functions -# Determine the base and follow a runlevel link name. -base=${0##*/} -link=${base#*[SK][0-9][0-9]} +HEARTBEAT=/usr/libexec/heartbeat/heartbeat -# Force execution if not called by a runlevel directory. -test $link = $base && START=yes -test "$START" = "yes" || exit 0 +[ -r /etc/sysconfig/heartbeat ] && . /etc/sysconfig/heartbeat +[ -r /etc/sysconfig/pacemaker ] && . /etc/sysconfig/pacemaker +[ -r /etc/sysconfig/sbd ] && . /etc/sysconfig/sbd HA_DIR=/etc/ha.d; export HA_DIR CONFIG=$HA_DIR/ha.cf @@ -67,25 +59,52 @@ LOCKDIR=/var/lock/subsys RUNDIR=/var/run +LRMADMIN=/usr/sbin/lrmadmin +SBD_BIN=/usr/sbin/sbd -# Echo without putting a newline on the end -EchoNoNl() { - Echo "$@" +StartSBD() { + test -x $SBD_BIN || return + test -z "$SBD_DEVICE" && return + + # Would be nice if sbd would + # cleanly handle double start internally + ps -eo cmd | grep "^$SBD_BIN -d" > /dev/null && return + + echo -n "Starting SBD - " + local ERROR + if ! ERROR=`$SBD_BIN -d $SBD_DEVICE -D $SBD_OPTS watch 2>&1` ; then + echo "SBD failed to start; aborting." + if [ ! -z "$ERROR" ]; then + echo + echo "$ERROR" + fi + exit 1 + fi } -# Echo with escapes enabled... -EchoEsc() { - Echo "$@" +StopSBD() { + test -x $SBD_BIN || return + test -z "$SBD_DEVICE" && return + + echo -n "Stopping SBD - " + local ERROR + if ! ERROR=`$SBD_BIN -d $SBD_DEVICE -D $SBD_OPTS message LOCAL exit 2>&1` ; then + echo "SBD failed to stop; aborting." + if [ ! -z "$ERROR" ]; then + echo + echo "$ERROR" + fi + exit 1 + fi } echo_failure() { - EchoEsc " Heartbeat failure [rc=$1]. $rc_failed" + echo " Heartbeat failure [rc=$1]. $rc_failed" return $1 } echo_success() { - : Cool! It started! - EchoEsc "$rc_done" + echo "$rc_done" } if @@ -123,25 +142,24 @@ # Set this to a 1 if you want to automatically load kernel modules USE_MODULES=1 -[ -x $HA_BIN/heartbeat ] || exit 0 +[ -x $HEARTBEAT ] || exit 0 # # Some environments like it if we use their functions... # if - [ ! -x $DISTFUNCS ] + [ ! -r $DISTFUNCS ] then # Provide our own versions of these functions status() { - $HA_BIN/heartbeat -s + $HEARTBEAT -s } echo_failure() { - EchoEsc " Heartbeat failure [rc=$1]. $rc_failed" + echo " Heartbeat failure [rc=$1]. $rc_failed" return $1 } echo_success() { - : Cool! It started! - EchoEsc "$rc_done" + echo "$rc_done" } else . $DISTFUNCS @@ -153,55 +171,26 @@ if [ ! -f $CONFIG ] then - EchoNoNl "Heartbeat not configured: $CONFIG not found." + echo -n "Heartbeat not configured: $CONFIG not found." echo_failure 1 exit 0 fi +CRM_ENABLED_RV="" CrmEnabled() { - case `ha_parameter crm | tr '[A-Z]' '[a-z]'` in - y|yes|enable|on|true|1|manual) true;; - *) false;; + test -n "$CRM_ENABLED_RV" && return $CRM_ENABLED_RV + local value + value=`ha_parameter pacemaker | tr '[A-Z]' '[a-z]'` + [ -n "$value" ] || value=`ha_parameter crm | tr '[A-Z]' '[a-z]'` + case $value in + y|yes|enable|on|true|1|manual|respawn) + CRM_ENABLED_RV=0 + return 0 ;; + *) + CRM_ENABLED_RV=1 + return 1 ;; esac } -StartLogd() { - - $HA_BIN/ha_logd -s >/dev/null 2>&1 - - if - [ $? -eq 0 ] - then - Echo "logd is already running" - return 0 - fi - - - $HA_BIN/ha_logd -d >/dev/null 2>&1 - if - [ $? -ne 0 ] - then - Echo "starting logd failed" - fi - -} - -StopLogd() { - $HA_BIN/ha_logd -s >/dev/null 2>&1 - - if - [ $? -ne 0 ] - then - Echo "logd is already stopped" - return 0 - fi - - $HA_BIN/ha_logd -k >/dev/null 2>&1 - if - [ $? -ne 0 ] - then - Echo "stopping logd failed" - fi -} init_watchdog() { if @@ -231,9 +220,9 @@ insmod=no # What do they think /dev/watchdog is named? MISCDEV=`grep ' misc$' /proc/devices | cut -c1-4` - MISCDEV=`Echo $MISCDEV` + MISCDEV=`echo $MISCDEV` WATCHDEV=`ha_parameter watchdog` - WATCHDEV=`Echo $WATCHDEV` + WATCHDEV=`echo $WATCHDEV` if [ "X$WATCHDEV" != X ] then @@ -274,6 +263,33 @@ fi } # init_watchdog_linux() +wait_for_lrmd() { + local maxwait=20 + local i=0 + echo -n "waiting for lrmd to become responsive " + while [ $i -lt $maxwait ]; do + $LRMADMIN -C > /dev/null 2>&1 && + break + sleep 2 + echo -n . + i=$(($i+1)) + done + if [ $i -lt $maxwait ]; then + return 0 + else + echo "lrmd apparently didn't start" + return 1 + fi +} +set_lrmd_options() { + CrmEnabled || return + test -x $LRMADMIN || return + if [ -n "$LRMD_MAX_CHILDREN" ]; then + wait_for_lrmd || return + $LRMADMIN -p max-children $LRMD_MAX_CHILDREN + fi +} + # # Start the heartbeat daemon... @@ -281,7 +297,7 @@ start_heartbeat() { if - ERROR=`$HA_BIN/heartbeat 2>&1` + ERROR=`$HEARTBEAT 2>&1` then : OK else @@ -289,13 +305,20 @@ fi } +mkdir_chmod_chown() +{ + local d=$1 m=$2 o=$3 + test -n "$d" || return + test -d "$d" || mkdir "$d" || return + chmod "$m" "$d" && chown "$o" "$d" +} # # Start Linux-HA # StartHA() { - EchoNoNl "Starting High-Availability services: " + echo -n "Starting High-Availability services: " if CrmEnabled @@ -310,32 +333,40 @@ # Create /dev/watchdog and load module if we should init_watchdog fi - rm -f $RUNDIR/ppp.d/* - if - [ ! -d $RUNDIR/heartbeat ] - then - mkdir -p $RUNDIR/heartbeat/ccm - mkdir -p $RUNDIR/heartbeat/crm - chown -R hacluster:haclient $RUNDIR/heartbeat - chmod -R 750 $RUNDIR/heartbeat - fi + ( + # $RUNDIR may be a tmpfs on some systems + umask 027 + + # see http://developerbugs.linux-foundation.org/show_bug.cgi?id=2378 + # HA_RSCTMP is defined in ocf-directories, sourced from ocf-shellfuncs, + # sourced from $HA_DIR/shellfuncs. + mkdir_chmod_chown "$HA_RSCTMP" 1755 root:root + + for d in crm heartbeat heartbeat/ccm heartbeat/crm heartbeat/dopd; do + mkdir_chmod_chown "$RUNDIR/$d" 750 hacluster:haclient + done + ) if [ -f $HA_DIR/ipresources -a ! -f $HA_DIR/haresources ] then mv $HA_DIR/ipresources $HA_DIR/haresources fi + # Start SBD, if enabled. + # Start failure will be fatal (exit this script) + StartSBD # Start heartbeat daemon if start_heartbeat then + set_lrmd_options echo_success return 0 else RC=$? echo_failure $RC if [ ! -z "$ERROR" ]; then - Echo - Echo "$ERROR" + echo + echo "$ERROR" fi return $RC fi @@ -345,11 +376,12 @@ # Ask heartbeat to stop. It will give up its resources... # StopHA() { - EchoNoNl "Stopping High-Availability services: " + echo -n "Stopping High-Availability services: " if - $HA_BIN/heartbeat -k &> /dev/null # Kill it + $HEARTBEAT -k >/dev/null 2>&1 # Kill it then + StopSBD echo_success return 0 else @@ -360,7 +392,7 @@ } StatusHA() { - $HA_BIN/heartbeat -s + $HEARTBEAT -s } StandbyHA() { @@ -384,7 +416,7 @@ if StatusHA >/dev/null 2>&1 then - EchoNoNl "Attempting to enter standby mode" + echo -n "Attempting to enter standby mode" if $HA_NOARCHBIN/hb_standby then @@ -394,7 +426,7 @@ echo_failure $? fi else - Echo "Heartbeat is not currently running." + echo "Heartbeat is not currently running." exit 1 fi } @@ -403,10 +435,10 @@ # Ask heartbeat to restart. It will *keep* its resources # ReloadHA() { - EchoNoNl "Reloading High-Availability services: " + echo -n "Reloading High-Availability services: " if - $HA_BIN/heartbeat -r # Restart, and keep your resources + $HEARTBEAT -r # Restart, and keep your resources then echo_success return 0 @@ -431,11 +463,10 @@ case "$1" in start) - StartLogd RunStartStop pre-start StartHA RC=$? - Echo + echo if [ $RC -eq 0 ] then @@ -446,8 +477,14 @@ ;; standby) - StandbyHA - RC=$?;; + if CrmEnabled; then + echo "use 'crm_stanby -v on' instead" + RC=1 + else + StandbyHA + RC=$? + fi + ;; status) StatusHA @@ -457,37 +494,38 @@ RunStartStop "pre-stop" StopHA RC=$? - Echo + echo if [ $RC -eq 0 ] then rm -f $LOCKDIR/$SUBSYS fi RunStartStop post-stop $RC - StopLogd ;; restart) sleeptime=`ha_parameter deadtime` StopHA - Echo - EchoNoNl Waiting to allow resource takeover to complete: - sleep $sleeptime - sleep 10 # allow resource takeover to complete (hopefully). - echo_success - Echo + if ! CrmEnabled ; then + echo + echo -n "Waiting to allow resource takeover to complete:" + sleep $sleeptime + sleep 10 # allow resource takeover to complete (hopefully). + echo_success + fi + echo StartHA - Echo + echo ;; force-reload|reload) ReloadHA - Echo + echo RC=$? ;; *) - Echo "Usage: $0 {start|stop|status|restart|reload|force-reload}" + echo "Usage: $0 {start|stop|status|restart|reload|force-reload}" exit 1 esac --- NEW FILE: logd --- #!/bin/sh # # # logd Start logd (non-blocking log service) # # Author: Dejan Muhamedagic <dmu...@su...> # (After the heartbeat init script) # License: GNU General Public License (GPL) # # This script works correctly under SuSE, Debian, # Conectiva, Red Hat and a few others. Please let me know if it # doesn't work under your distribution, and we'll fix it. # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # # chkconfig: 2345 19 21 # description: Startup script logd service. # processname: ha_logd # pidfile: /var/run/logd.pid # config: /etc/logd.cf # ### BEGIN INIT INFO # Description: ha_logd is a non-blocking logging daemon. # It can log messages either to a file or through syslog # daemon. # Short-Description: ha_logd logging daemon # Provides: ha_logd # Required-Start: $network $syslog $remote_fs # Required-Stop: $network $syslog $remote_fs # X-Start-Before: heartbeat openais corosync # Default-Start: 3 5 # Default-Stop: 0 1 6 ### END INIT INFO # settings source /etc/sysconfig/config # parameters CONFIGNAME=LDIRECTORD eval START=\$START_$CONFIGNAME # Determine the base and follow a runlevel link name. base=${0##*/} link=${base#*[SK][0-9][0-9]} # Force execution if not called by a runlevel directory. test $link = $base && START=yes test "$START" = "yes" || exit 0 LOGD_CFG=/etc/logd.cf LOGD_OPT="" [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG" [ -d /usr/lib ] && LOGD_BIN="/usr/lib/heartbeat/ha_logd" [ -d /usr/lib64 ] && LOGD_BIN="/usr/lib64/heartbeat/ha_logd" if [ ! -f $LOGD_BIN ]; then echo -n "ha_logd not installed." exit 5 fi StartLogd() { echo -n "Starting ha_logd: " $LOGD_BIN -s >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "logd is already running" return 0 fi $LOGD_BIN -d $LOGD_OPT >/dev/null 2>&1 if [ $? -ne 0 ]; then echo "starting logd failed" exit 1 fi echo "ok" exit 0 } StopLogd() { echo -n "Stopping ha_logd: " $LOGD_BIN -s >/dev/null 2>&1 if [ $? -ne 0 ]; then echo "logd is already stopped" return 0 fi $LOGD_BIN -k >/dev/null 2>&1 if [ $? -ne 0 ]; then echo "stopping logd failed" exit 1 fi echo "stopped" exit 0 } StatusLogd() { $LOGD_BIN -s exit $? } case "$1" in start) StartLogd ;; status) StatusLogd ;; stop) StopLogd ;; restart) sleeptime=1 $0 stop && sleep $sleeptime && $0 start echo ;; try-restart) $0 status && $0 restart ;; *) echo "Usage: $0 {start|stop|status|restart}" exit 1 esac |
|
From: Heiko Z. <smi...@us...> - 2015-12-12 21:52:02
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15444/scripts Modified Files: heartbeat iptables kmod Added Files: cluster-glue libnftnl Log Message: iptables needs kmod binaries in /sbin updating heartbeat to the latest version and adding required dependencies Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- iptables 12 Dec 2015 14:48:13 -0000 1.43 +++ iptables 12 Dec 2015 21:52:00 -0000 1.44 @@ -19,7 +19,8 @@ build ) FLAGS="-O2" - ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel || exit 1 + ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel --enable-libipq --enable-nfsynproxy \ + --localstatedir=/var --sysconfdir=/etc || exit 1 #replace_str Makefile "/usr/local" "/usr" # seems like iptables comple is unhappy in some circumstances, let's see if that makes it better make clean @@ -36,10 +37,11 @@ ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/source rm -rf $TMPDIR || exit 1 - mkdir -p $TMPDIR/sbin || exit 1 + mkdir -p $TMPDIR/etc || exit 1 mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1 make install KERNEL_DIR=$KERNELDIR DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR + copy_files $TMPDIR/etc $ETCDIR/etc || exit 1 copy_files $TMPDIR/usr/bin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1 --- NEW FILE: libnftnl --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/libnftnl,v $ # $Revision: 1.1 $ # $Date: 2015/12/12 21:52:00 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it make install ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- heartbeat 6 Oct 2015 00:59:16 -0000 1.27 +++ heartbeat 12 Dec 2015 21:52:00 -0000 1.28 @@ -20,23 +20,23 @@ build ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Heartbeat) || exit 1 - replace_str "include/clplumbing/cl_uuid.h" "glib/gtypes.h" "glib.h" - patch_from_file 1 $DL_DIR/src/heartbeat-poderror_ldirectord.patch.xz || exit 1 if [ "$CONFIG_PYTHON" = "y" ]; then if [ "$CONFIG_NET_SNMP" != "y" ]; then SNMP="--disable-snmp" fi - patch_from_file 1 $DL_DIR/src/heartbeat-2.1.4_install_fix.patch.xz || exit 1 - - #CFLAGS="-D_FORTIFY_SOURCE=0" - #CC="gcc -nopie -fno-stack-protector" - #CFLAGS="$CFLAGS -fno-stack-protector -D_FORTIFY_SOURCE=0" ./ConfigureMe configure --prefix=/usr --disable-quorumd \ + --disable-doc --with-group-id=50 --with-ccmuser-id=50 \ --localstatedir=/var --sysconfdir=/etc ${SNMP} --enable-fatal-warnings=no || exit 1 - #CFLAGS="$CFLAGS -fno-stack-protector -D_FORTIFY_SOURCE=0" ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ${SNMP} || exit 1 - make $PMAKE all || exit 1 + # disable the building of the documentation, since we don't have internet access + #replace_str doc/Makefile /usr/bin/xsltproc /bin/true + rm doc/Makefile + echo "all:" > doc/Makefile + echo "install:" >> doc/Makefile + echo "clean:" >> doc/Makefile + + make $PMAKE all || exit 1 fi fi @@ -53,36 +53,23 @@ copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/etc/init.d || exit 1 find $TMPDIR/usr/lib/ -name \*a | xargs rm || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 copy_files $TMPDIR/var $CDDIR/ || exit 1 copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - cp -dpv ldirectord/ldirectord.cf $ETCDIR/etc/ha.d/ || exit 1 - - useradd -s /bin/false -u 50 hacluster - groupadd -f -g 50 haclient rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/heartbeat $ETCDIR/etc/init.d/ || exit 1 - cp -dp $MYDIR/scripts/ldirectord $ETCDIR/etc/init.d/ || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE echo "START_$MYNAME=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_$MYNAME=\"$MYNAME is to control failover servers\"" >> $SOFTWAREHELP - - MYNAME=LDIRECTORD - echo "# Start $MYNAME?" >> $CONFIGFILE - echo "START_$MYNAME=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_$MYNAME=\"$MYNAME is to monitor remote servers (works with heartbeat)\"" >> $SOFTWAREHELP - echo "/var/lib/heartbeat/crm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/lib/heartbeat/pengine hacluster.haclient 770" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/lib/heartbeat/cores/hacluster hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/run/heartbeat/crm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/run/heartbeat/ccm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base + echo "/var/lib/heartbeat hacluster.hacluster 700" >> $ETCDIR/etc/sysconfig/permissions.base + echo "/var/run/heartbeat hacluster.hacluster 700" >> $ETCDIR/etc/sysconfig/permissions.base fi --- NEW FILE: cluster-glue --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/cluster-glue,v $ # $Revision: 1.1 $ # $Date: 2015/12/12 21:51:57 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings MYNAME=HEARTBEAT case $1 in build ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Reusable-Cluster-Components-glue) || exit 1 ./autogen.sh || exit 1 ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-libnet --disable-doc || exit 1 make $PMAKE all || exit 1 make install || exit 1 fi ;; install ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Reusable-Cluster-Components-glue) || exit 1 rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 groupadd -f -g 50 hacluster useradd -s /bin/false -u 50 -g hacluster hacluster make install DESTDIR=$TMPDIR || exit 1 rm -rf $TMPDIR/usr/share/doc || exit 1 rm -rf $TMPDIR/usr/share/cluster-glue/lrmtest || exit 1 rm -rf $TMPDIR/usr/include || exit 1 copy_docs $TMPDIR find $TMPDIR/usr -name \*a | xargs rm || exit 1 copy_files $TMPDIR/usr $CDDIR/usr || exit 1 copy_files $TMPDIR/var $CDDIR/var || exit 1 cp -v logd/logd.cf $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/logd $ETCDIR/etc/init.d/ || exit 1 echo "# Start LOGD?" >> $CONFIGFILE echo "START_LOGD=no" >> $CONFIGFILE echo >> $CONFIGFILE fi ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kmod 4 Dec 2015 01:13:35 -0000 1.7 +++ kmod 12 Dec 2015 21:52:00 -0000 1.8 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib --with-xz --with-zlib || exit 1 + ./configure --prefix=/usr -bindir=/sbin --sysconfdir=/etc --with-rootlibdir=/lib --with-xz --with-zlib || exit 1 replace_str Makefile "sed -E" "sed -e" # don't do parallel builds make all || exit 1 @@ -27,7 +27,7 @@ do test -f /sbin/${FILE} && rm -fv /sbin/${FILE} test -f /bin/${FILE} && rm -fv /bin/${FILE} - ln -sf kmod /bin/${FILE} || exit 1 + ln -sf kmod /sbin/${FILE} || exit 1 done #fix the symlink @@ -40,14 +40,14 @@ make install DESTDIR=$TMPDIR || exit 1 for FILE in depmod insmod lsmod modinfo modprobe rmmod do - ln -sf kmod $TMPDIR/bin/${FILE} || exit 1 + ln -sf kmod $TMPDIR/sbin/${FILE} || exit 1 done rm -rf $TMPDIR/usr/include || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 copy_docs $TMPDIR - copy_files $TMPDIR/bin $CDDIR || exit 1 + copy_files $TMPDIR/sbin $CDDIR || exit 1 copy_files $TMPDIR/usr $CDDIR || exit 1 rm -rf $TMPDIR || exit 1 ;; |
|
From: Heiko Z. <smi...@us...> - 2015-12-12 14:48:15
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31306 Modified Files: iptables Log Message: make sure we got all the files we need Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- iptables 6 Oct 2015 00:59:16 -0000 1.42 +++ iptables 12 Dec 2015 14:48:13 -0000 1.43 @@ -19,10 +19,6 @@ build ) FLAGS="-O2" - #patch_from_file 1 $DL_DIR/src/iptables-*-imq.patch.xz || exit 1 - #chmod +x extensions/.IMQ-test* - #patch_from_file 1 $DL_DIR/src/iptables-linux_3.2_compat.patch.xz || exit 1 - ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel || exit 1 #replace_str Makefile "/usr/local" "/usr" # seems like iptables comple is unhappy in some circumstances, let's see if that makes it better @@ -35,7 +31,7 @@ ;; install ) - # Make sure the links are present + # Make sure the links are present ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/build ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/source @@ -47,6 +43,7 @@ copy_files $TMPDIR/usr/bin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1 + copy_files $TMPDIR/usr/share/xtables $CDDIR/usr/share || exit 1 rm -rf $TMPDIR || exit 1 ;; |
|
From: Heiko Z. <smi...@us...> - 2015-12-11 23:13:18
|
Update of /cvsroot/devil-linux/build/scripts/configuration/profiles In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26318 Modified Files: default server Log Message: enabled shellinabox in config Index: default =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- default 7 Nov 2015 15:41:54 -0000 1.147 +++ default 11 Dec 2015 23:13:16 -0000 1.148 @@ -217,3 +217,4 @@ CONFIG_ZISOFS=y CONFIG_ZONEMINDER=y CONFIG_OPENDKIM=y +CONFIG_SHELLINABOX=y Index: server =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/server,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- server 7 Nov 2015 15:41:54 -0000 1.60 +++ server 11 Dec 2015 23:13:16 -0000 1.61 @@ -217,3 +217,4 @@ CONFIG_ZISOFS=y CONFIG_ZONEMINDER=y CONFIG_OPENDKIM=y +CONFIG_SHELLINABOX=y |
|
From: Heiko Z. <smi...@us...> - 2015-12-04 01:13:37
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29449 Modified Files: kmod Log Message: make sure the symlink to the lib is correct Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kmod 1 Dec 2015 13:10:29 -0000 1.6 +++ kmod 4 Dec 2015 01:13:35 -0000 1.7 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib \--with-xz --with-zlib || exit 1 + ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib --with-xz --with-zlib || exit 1 replace_str Makefile "sed -E" "sed -e" # don't do parallel builds make all || exit 1 @@ -29,6 +29,9 @@ test -f /bin/${FILE} && rm -fv /bin/${FILE} ln -sf kmod /bin/${FILE} || exit 1 done + + #fix the symlink + ln -sf /lib/libkmod.so.2 /usr/lib/libkmod.so ;; install ) |
|
From: Heiko Z. <smi...@us...> - 2015-12-04 00:59:57
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28925 Modified Files: Makefile.build Log Message: pciutils depends on kmod Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- Makefile.build 7 Nov 2015 21:11:02 -0000 1.93 +++ Makefile.build 4 Dec 2015 00:59:54 -0000 1.94 @@ -501,7 +501,7 @@ parted: | $(GROUP_18) -pciutils: | $(GROUP_15) +pciutils: | $(GROUP_15) kmod perl: | $(GROUP_18) clamav |
|
From: Heiko Z. <smi...@us...> - 2015-12-01 13:10:31
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27310/scripts Modified Files: kmod Log Message: parallel builds cause problems when too many CPUs are used Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- kmod 29 Nov 2015 19:07:50 -0000 1.5 +++ kmod 1 Dec 2015 13:10:29 -0000 1.6 @@ -18,7 +18,8 @@ build ) ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib \--with-xz --with-zlib || exit 1 replace_str Makefile "sed -E" "sed -e" - make $PMAKE all || exit 1 + # don't do parallel builds + make all || exit 1 # install it in local system, because other programs could need it make install |
|
From: Heiko Z. <smi...@us...> - 2015-11-29 19:07:53
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25170 Modified Files: build-iso kmod Log Message: user more resources when creating ISO make sure we use the proper sed syntax Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kmod 27 Nov 2015 17:15:11 -0000 1.4 +++ kmod 29 Nov 2015 19:07:50 -0000 1.5 @@ -17,6 +17,7 @@ case $1 in build ) ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib \--with-xz --with-zlib || exit 1 + replace_str Makefile "sed -E" "sed -e" make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- build-iso 27 Nov 2015 21:57:17 -0000 1.93 +++ build-iso 29 Nov 2015 19:07:50 -0000 1.94 @@ -18,10 +18,8 @@ # source functions and config source $MYDIR/settings -# make sure we use the greater of the 2 -if [ $CONFIG_PARALLEL_JOBS -lt $CONFIG_PMAKE ]; then - CONFIG_PARALLEL_JOBS=$CONFIG_PMAKE -fi +# let's make sure we use all the resources we got +let "CONFIG_PARALLEL_JOBS=${CONFIG_PARALLEL_JOBS}+${CONFIG_PMAKE}" case $1 in iso ) |
|
From: Heiko Z. <smi...@us...> - 2015-11-28 15:16:35
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19145 Modified Files: linux php Log Message: more tweaking Index: php =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/php,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- php 27 Nov 2015 21:57:17 -0000 1.40 +++ php 28 Nov 2015 15:16:32 -0000 1.41 @@ -102,7 +102,6 @@ make install INSTALL_ROOT=$TMPDIR - mv $TMPDIR/usr/php/man/man1/* $CDDIR/usr/share/man/man1 || exit 1 rm -rf $TMPDIR/usr/php || exit 1 replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr replace_str $TMPDIR/etc/apache2/httpd.conf ${TMPDIR#*/}/usr /usr Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- linux 13 Dec 2011 19:54:10 -0000 1.77 +++ linux 28 Nov 2015 15:16:32 -0000 1.78 @@ -47,6 +47,7 @@ cp -v arch/x86/boot/bzImage $BOOTIMAGEDIR/vmlinuz || exit 1 cp -v System.map $BOOTIMAGEDIR/boot || exit 1 cp -v System.map $CDDIR/boot || exit 1 + depmod -ae -b $CDDIR -F $CDDIR/boot/System.map $KERNELVERSION || exit 1 mkdir -p $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers || exit 1 cp -dpvR $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/scsi $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1 cp -dpvR $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ata $INITRDDIR/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2015-11-27 21:57:19
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12969/scripts Modified Files: LPRng awstats build-iso cd_cleanup create_cd_dirs dar httpd krb5 libdbi man-pages mysql pam_mount php razor-agents samba snort Log Message: reduced the ISO sizes and removed unwanted files & folders Index: krb5 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/krb5,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- krb5 6 Oct 2015 00:59:16 -0000 1.14 +++ krb5 27 Nov 2015 21:57:17 -0000 1.15 @@ -34,6 +34,7 @@ mkdir -p $TMPDIR/usr/sbin || exit 1 make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/share/examples || exit 1 cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share/ || exit 1 rm -rf $TMPDIR/usr/share || exit 1 copy_docs $TMPDIR Index: httpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/httpd,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- httpd 21 Jun 2015 13:23:35 -0000 1.21 +++ httpd 27 Nov 2015 21:57:17 -0000 1.22 @@ -97,6 +97,8 @@ rm -rf $TMPDIR/etc/apache2/build || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/share/apache2/default-site/htdocs/manual || exit 1 + rm -rf $TMPDIR/usr/share/apache2/icons || exit 1 cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR/etc copy_docs $TMPDIR/ Index: samba =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/samba,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- samba 6 Oct 2015 00:59:17 -0000 1.42 +++ samba 27 Nov 2015 21:57:17 -0000 1.43 @@ -47,6 +47,7 @@ rm -rf $TMPDIR/usr/include || exit 1 copy_files $TMPDIR/usr/share/samba $CDDIR/usr/share || exit 1 rm -rf $TMPDIR/usr/share/samba || exit 1 + rm -v $TMPDIR/usr/bin/smbtorture || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 copy_files $TMPDIR/var $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: cd_cleanup =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- cd_cleanup 31 Oct 2015 14:37:58 -0000 1.22 +++ cd_cleanup 27 Nov 2015 21:57:17 -0000 1.23 @@ -16,7 +16,7 @@ case $1 in install ) - ls -1 $CDDIR/usr/include/* | grep -v "^python" | xargs -n 1 rm -rf + ls -1d $CDDIR/usr/include/* | grep -v "/usr/include/python" | xargs -n 1 rm -rf find $CDDIR -type f -name '*.la' | grep -v Magick | xargs -n 1 rm -f find $CDDIR -type f -name '*.a' | xargs -n 1 rm -f for DIR in $INITRDDIR $CDDIR @@ -31,7 +31,11 @@ done rm -rf $CDDIR/usr/lib/pkgconfig - + rm -rf $CDDIR/usr/share/pkgconfig + rm -rf $CDDIR/usr/share/aclocal + rm -rf $CDDIR/usr/share/doc/* + rm -rf $CDDIR/usr/share/info/* + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then rm -rf $ISODIR/cdtree/doc || exit 1 fi Index: libdbi =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libdbi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libdbi 5 Dec 2011 09:11:38 -0000 1.3 +++ libdbi 27 Nov 2015 21:57:17 -0000 1.4 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr --disable-docs || exit 1 + ./configure --prefix=/usr --localstatedir=/var --disable-docs || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: awstats =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/awstats,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- awstats 6 Jan 2010 14:53:27 -0000 1.5 +++ awstats 27 Nov 2015 21:57:17 -0000 1.6 @@ -22,6 +22,8 @@ if [ "$CONFIG_AWSTATS" = "y" ]; then rm -rf $TMPDIR || exit 1 + rm -rf tools/webmin 2> /dev/null + mkdir -p $CDDIR/usr/local/awstats || exit 1 cp -dpR * $CDDIR/usr/local/awstats/ || exit 1 Index: create_cd_dirs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- create_cd_dirs 6 Oct 2015 00:59:15 -0000 1.43 +++ create_cd_dirs 27 Nov 2015 21:57:17 -0000 1.44 @@ -31,6 +31,8 @@ DIRS='boot lib/modules bin sbin usr/bin usr/sbin usr/lib usr/share usr/share/doc usr/share/man usr/share/info usr/share/devillinux shm opt dev tmp root etc mnt sys jail' mk_dir $CDDIR $DIRS mkdir -p $CDDIR/usr/share/man/man{1,2,3,4,5,6,7,8,9} + ln -sf /usr/share/info $CDDIR/usr/info + ln -sf /usr/share/doc $CDDIR/usr/doc # the initrd tree DIRS='cd cdrom dev floppy lib proc sbin tmp shm' @@ -50,7 +52,7 @@ DIRS='bin boot cd cdrom floppy initrd lib proc sbin var home' mk_dir $CDDIR $DIRS - DIRS='bin doc include info lib man sbin share src' + DIRS='bin include lib man sbin share src' mk_dir $CDDIR/usr $DIRS mk_dir $CDDIR/usr/local $DIRS Index: LPRng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LPRng,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- LPRng 5 Dec 2011 09:11:37 -0000 1.11 +++ LPRng 27 Nov 2015 21:57:17 -0000 1.12 @@ -37,6 +37,7 @@ # install it into build system, because we need it later make install DESTDIR=$TMPDIR || exit 1 rm -rf $TMPDIR/usr/lib || exit 1 + rm -rf $TMPDIR/usr/share/LPRng || exit 1 rm -rf $TMPDIR/etc/rc.d || exit 1 find $TMPDIR/etc -name \*.sample | xargs rm || exit 1 copy_docs $TMPDIR Index: pam_mount =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pam_mount,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pam_mount 5 Dec 2011 09:11:38 -0000 1.3 +++ pam_mount 27 Nov 2015 21:57:17 -0000 1.4 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr --sysconfdir=/etc || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 make $PMAKE || exit 1 ;; Index: snort =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/snort,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- snort 5 Dec 2011 09:11:38 -0000 1.23 +++ snort 27 Nov 2015 21:57:17 -0000 1.24 @@ -36,6 +36,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/src || exit 1 copy_docs $TMPDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: dar =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dar,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dar 5 Dec 2011 09:11:37 -0000 1.6 +++ dar 27 Nov 2015 21:57:17 -0000 1.7 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_DAR" = "y" ]; then # Don't use infinints as they suck RAM up. 64bits should allow 4GB^2 of archive. - ./configure --enable-mode=64 --prefix=/usr + ./configure --sysconfdir=/etc --enable-mode=64 --prefix=/usr make LDFLAGS="-Wl,-z,noexecstack" $PMAKE all || exit 1 fi @@ -35,6 +35,7 @@ copy_docs $TMPDIR rm -rf $TMPDIR/usr/{man,info} || exit 1 rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/share/dar || exit 1 rm -f $TMPDIR/usr/lib/*a || exit 1 mkdir -p $CDDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 Index: mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mysql,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- mysql 20 Oct 2015 00:22:21 -0000 1.36 +++ mysql 27 Nov 2015 21:57:17 -0000 1.37 @@ -49,6 +49,7 @@ rm -rf $TMPDIR/usr/include || exit 1 test -d $TMPDIR/usr/lib64 && mv $TMPDIR/usr/lib64 $TMPDIR/usr/lib rm $TMPDIR/usr/lib/*.a || exit 1 + rm -v $TMPDIR/usr/bin/mysql*test* || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/mysql-test || exit 1 rm -rf $TMPDIR/usr/share/mysql-test || exit 1 Index: man-pages =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/man-pages,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- man-pages 23 Feb 2010 00:49:12 -0000 1.11 +++ man-pages 27 Nov 2015 21:57:17 -0000 1.12 @@ -19,19 +19,16 @@ echo copying missing man pages for MAN in man? do - cp -upR $MAN $CDDIR/usr/share/man + cp -vupR $MAN $CDDIR/usr/share/man/ done mv $CDDIR/usr/man $CDDIR/usr/share/man && ln -sf share/man $CDDIR/usr/man echo cleaning out unneeded man directories #delete man pages we don't need in DL - rm -rf $CDDIR/usr/share/man/man2 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man2 - rm -rf $CDDIR/usr/share/man/man3 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man3 - rm -rf $CDDIR/usr/share/man/man9 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man9 + rm -rf $CDDIR/usr/share/man/man2/* &> /dev/null + rm -rf $CDDIR/usr/share/man/man3/* &> /dev/null + rm -rf $CDDIR/usr/share/man/man9/* &> /dev/null rm -rf $CDDIR/usr/share/man/cat2 &> /dev/null rm -rf $CDDIR/usr/share/man/cat3 &> /dev/null rm -rf $CDDIR/usr/share/man/cat9 &> /dev/null @@ -49,14 +46,19 @@ #done #exit 1 + echo "uncompressing man pages" + find $CDDIR/usr/share/man/ -type f -name '*bz2' | xargs -r bunzip2 + find $CDDIR/usr/share/man/ -type f -name '*gz' | xargs -r gunzip + find $CDDIR/usr/share/man/ -type f -name '*lzma' | xargs -r unlzma + echo "compressing man pages" - find $CDDIR/usr/share/man/ -type f -a ! -name '*bz2' -a ! -name '*gz' | xargs -r lzma -f -9 + find $CDDIR/usr/share/man/ -type f | xargs -r xz # Try to fix symlinks broken after compressing for a in $(ls -1d $CDDIR/usr/share/man/*); do pushd $a for i in `find -type l -exec file {} \; | grep "broken symbolic link" | awk ' {print $1}' | tr -s "[:]" "\040"` ; do - $(ln -sf `echo $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.lzma' `readlink $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.lzma') && rm -f $i + $(ln -sf `echo $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.xz' `readlink $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.xz') && rm -f $i done popd done Index: php =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/php,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- php 6 Oct 2015 00:59:17 -0000 1.39 +++ php 27 Nov 2015 21:57:17 -0000 1.40 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_PHP" = "y" ]; then PARAMS="--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --enable-inline-optimization" - PARAMS="$PARAMS --enable-pcntl --enable-cgi " + PARAMS="$PARAMS --mandir=/usr/share/man --enable-pcntl --enable-cgi" PARAMS="$PARAMS --enable-discard-path --with-zlib --with-bz2 --enable-calendar --with-gmp" PARAMS="$PARAMS --enable-dba --with-gdbm --with-db4 --with-xsl=/usr --with-dom-exslt" PARAMS="$PARAMS --enable-ftp --enable-soap --enable-wddx --enable-exif" @@ -102,10 +102,16 @@ make install INSTALL_ROOT=$TMPDIR + mv $TMPDIR/usr/php/man/man1/* $CDDIR/usr/share/man/man1 || exit 1 + rm -rf $TMPDIR/usr/php || exit 1 replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr replace_str $TMPDIR/etc/apache2/httpd.conf ${TMPDIR#*/}/usr /usr rm $TMPDIR/etc/apache2/httpd.conf.bak rm $TMPDIR/etc/apache2/httpd.conf.old + rm -rf $TMPDIR/usr/lib/php/build || exit 1 + rm -rf $TMPDIR/usr/lib/php/doc || exit 1 + rm -rf $TMPDIR/usr/lib/php/test || exit 1 + rm -rf $TMPDIR/usr/lib/php/build cp -dp $TMPDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/ cp -dp /etc/php.ini $ETCDIR/etc/ || exit 1 cp -dp /etc/pear.conf $ETCDIR/etc/ || exit 1 Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- build-iso 27 Nov 2015 17:15:11 -0000 1.92 +++ build-iso 27 Nov 2015 21:57:17 -0000 1.93 @@ -250,7 +250,7 @@ # and gzip our ramdisk image and put it in the right place. #gzip -9 -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz - gzip -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz + gzip -9 -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz # we are done with the uncompressed ramdisk image, delete it rm $WORKDIR/ramdisk Index: razor-agents =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- razor-agents 5 Dec 2011 09:11:38 -0000 1.9 +++ razor-agents 27 Nov 2015 21:57:17 -0000 1.10 @@ -35,7 +35,8 @@ make DESTDIR=$TMPDIR install || exit 1 - copy_docs $TMPDIR + find -name raz\*.1 -exec mv -vf {} $CDDIR/usr/share/man/man1 \; + rm -rf $TMPDIR/usr/share/man || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 fi |
|
From: Heiko Z. <smi...@us...> - 2015-11-27 17:18:17
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2565 Modified Files: md5sum.lst Log Message: removed test files Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.767 retrieving revision 1.768 diff -u -d -r1.767 -r1.768 --- md5sum.lst 27 Nov 2015 17:15:11 -0000 1.767 +++ md5sum.lst 27 Nov 2015 17:18:15 -0000 1.768 @@ -27,7 +27,6 @@ 2555bcab6c3f60d79d986c920463119d src/awstats-7.4.tar.xz e2a116b966c9ed5f769d0d71504db6e9 src/backports.ssl_match_hostname-3.4.0.2.tar.xz 6ea1ad922ae71ddeffdc20c20c8d7dd1 src/bacula-5.2.13.tar.xz -4826580b77095287f7624450c71bcff3 src/bareos-15.2.2.tar.xz 2595801cecbaf3ccae0a64b1907f46b9 src/bash-4.3.30.tar.xz bda1715509276fb6db8df1daa62798a8 src/bash-patches.tar.xz f0d169fe05f10e8d3f8b449d8e1f28c1 src/bc-1.06.tar.xz @@ -326,7 +325,6 @@ 8f7e2001d399c862f817d929672b16d2 src/netpbm-10.35.96.tar.xz 9be85a5fab887f8078dc6ae511877abe src/nettle-3.1.1.tar.xz 4cdffb2c7f7fd2bdceaba55ab1b881da src/nfs-utils-1.3.2.tar.xz -532805eb2e0391e80bd648272cd19d98 src/nftables-0.5.tar.xz 5a32dc6a5dc035f6fe7d42bafba7d45f src/nginx-1.9.4.tar.xz 575113747350262a7a56977073c2dfa9 src/nmap-6.47.tar.xz 2a52b4127efea9a0a0759d858dfdb401 src/noip-2.1.9-1.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-11-27 17:15:13
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2403 Modified Files: md5sum.lst Log Message: fix module dependency issues put kmod progs into correct directory enable xz compression of modules update kernel and grsec Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.766 retrieving revision 1.767 diff -u -d -r1.766 -r1.767 --- md5sum.lst 8 Nov 2015 14:42:13 -0000 1.766 +++ md5sum.lst 27 Nov 2015 17:15:11 -0000 1.767 @@ -27,6 +27,7 @@ 2555bcab6c3f60d79d986c920463119d src/awstats-7.4.tar.xz e2a116b966c9ed5f769d0d71504db6e9 src/backports.ssl_match_hostname-3.4.0.2.tar.xz 6ea1ad922ae71ddeffdc20c20c8d7dd1 src/bacula-5.2.13.tar.xz +4826580b77095287f7624450c71bcff3 src/bareos-15.2.2.tar.xz 2595801cecbaf3ccae0a64b1907f46b9 src/bash-4.3.30.tar.xz bda1715509276fb6db8df1daa62798a8 src/bash-patches.tar.xz f0d169fe05f10e8d3f8b449d8e1f28c1 src/bc-1.06.tar.xz @@ -153,7 +154,7 @@ 1def1749d335a7a08d197d0cf41efe80 src/gradm-3.1-201507191652.tar.xz 43c48064d6409862b8a850db83c8038a src/grep-2.21.tar.xz aac369b842aa00e5e4cb1fd980f29155 src/groff-1.22.3.tar.xz -d8ecb6316d9fe9eb7d0f7211e973591d src/grsecurity-3.1-4.1.6-201508230818.patch.xz +fea329d9502a85f56cd867afd4ea9b73 src/grsecurity-3.1-4.2.6-201511232037.patch.xz be62932eade308a364ea4bbc91295930 src/grub-2.02~beta2.tar.xz 167f952085ab6e1d7695fb12be92fccd src/grub-patches.tar.xz 2185fa7ca42cbe989eddc9c9589f393d src/gss-1.0.3.tar.xz @@ -207,7 +208,7 @@ 62a4ae8aae94a4fec0d6f5a8163e9b51 src/kernel-patches-3.x.tar.xz 53f6f70e1e75ef66f1a218066e06389c src/keyutils-1.5.9.tar.xz f55a444345fb0fddda782acb6c58e88f src/kid-0.9.6.tar.xz -ee246fab2e1cba9fbdcad6a86ec31531 src/kmod-21.tar.xz +4371b847f3fbfaa4e9aa890ad616748f src/kmod-22.tar.xz ec2b7c2d29a5675bee93a1da597328e6 src/knock-0.7.tar.xz 8fd49bf583317896b81d2efbda4d166e src/krb5-1.13.2.tar.xz 569155f303af2b868baf089d9481167d src/less-458.tar.xz @@ -267,7 +268,7 @@ 28cb28097c07a735d6af56e598e1c90f src/libvorbis-1.3.5.tar.xz 10f1c6e82f908fef2d7cf5b05c60c7d4 src/libxml2-sources-2.9.2.tar.xz 208eb2d6d1e013a8caa6a10f8edb15a9 src/libxslt-1.1.28.tar.xz -fe9dc0f6729f36400ea81aa41d614c37 src/linux-4.1.tar.xz +3d5ea06d767e2f35c999eeadafc76523 src/linux-4.2.tar.xz 3b6a8df3206bb306d259cf510bef3b7b src/lm_sensors-3.4.0.tar.xz c135cdafbb299fb8c5af299931de4238 src/loadlin16c-devil.tar.xz f3c8bbc318ae0906046f957a2c656b63 src/logrotate-r3-9-1.tar.xz @@ -325,6 +326,7 @@ 8f7e2001d399c862f817d929672b16d2 src/netpbm-10.35.96.tar.xz 9be85a5fab887f8078dc6ae511877abe src/nettle-3.1.1.tar.xz 4cdffb2c7f7fd2bdceaba55ab1b881da src/nfs-utils-1.3.2.tar.xz +532805eb2e0391e80bd648272cd19d98 src/nftables-0.5.tar.xz 5a32dc6a5dc035f6fe7d42bafba7d45f src/nginx-1.9.4.tar.xz 575113747350262a7a56977073c2dfa9 src/nmap-6.47.tar.xz 2a52b4127efea9a0a0759d858dfdb401 src/noip-2.1.9-1.tar.xz @@ -340,7 +342,7 @@ f3a91dcf460719d53692279a31726d66 src/open-vm-tools-10.0.0-3000743.tar.xz e9131ebfa96a244b3e0a12407050c110 src/opendkim-2.10.3.tar.xz 42298aec04fb66fffee24f644879ee5f src/openldap-2.4.42.tar.xz -d15170621deae26838b195e2f4ad51bc src/openssh-7.0p1.tar.xz +5f7e7e7686a756bf0a8af73390197ebe src/openssh-7.1p1.tar.xz 8a3cd7e9ef08a4471fec714c9621a977 src/openssl-1.0.1p.tar.xz acc5ea4b08ad53173784520acbd4e9c3 src/openvpn-2.3.8.tar.xz 0654a933cbebba6a304641b0ed4255a8 src/otpd-3.2.5.tar.xz @@ -352,7 +354,7 @@ 97507ef79faef707f05caf2db3882fce src/pam_otp_auth-3.2.2.tar.xz 3e2d17060b1d74a3abef2ec971be6663 src/pam_radius-1.4.0.tar.xz 0247b6a7b314f8edeb618159fa95f9cb src/parted-3.2.tar.xz -7dea69f02c906206f88df48085069eb6 src/patch-4.1.6.xz +408f9975969da326b5804a04dbf0d4de src/patch-4.2.6.xz 017f3323f11e156323402293d21f57a1 src/pax-linux-2.6.32.10-test27.patch.xz d0a801704862e48d4bf46114019d30ae src/pax-utils-cvs-20111227.tar.xz ba0db9202b4f1dca656c28e88f804c8e src/paxctl-0.9.tar.xz @@ -835,7 +837,7 @@ a4c53b9d1fa0557c7231f5586dfcec78 src/rrdtool-1.2.30.tar.xz b94b7218a473333e68a85729eda3e388 src/rsync-3.1.1.tar.xz f9fc993692f97ff769ca52ec317ba96e src/sagator-1.3.0.tar.xz -1005e58d1654282fe2a8f2f3a2835518 src/samba-4.2.4.tar.xz +c328cec16352b461f140a865c26b6c38 src/samba-4.2.5.tar.xz 4416b8df4c4e3db0c891f7f00f61d9fc src/sarg-git-20151004.tar.xz cc29a8de1c1eae7fe559b601275b66d0 src/scponly-20110526.tar.xz 54b44c7d65d9336272a118456c8725a6 src/screen-4.3.1.tar.xz @@ -861,7 +863,7 @@ 0458bd8ffd537146d34b1a658c42efa5 src/special/tzdata2010l.tar.gz 894afc7d6e075040e09c5766f47db948 src/sqlite-autoconf-3081101.tar.xz bb20337f4369a59070a7c1fbff0a078c src/squashfs4.3.tar.xz -fe7306a90a0ba2fc906e9a8c741cc8ea src/squid-3.5.9.tar.xz +eb5e1cf3cf012e5b85d6f7ca78b7afab src/squid-3.5.11.tar.xz e7218083c399d80cca61b579d2931349 src/squidGuard-1.4.tar.xz d3266372113a78132d48f17a81d44eb1 src/squidguard-blacklist.tar.xz fa5fb3bba6f0c031c74a3a948862bad2 src/sslh-v1.17.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-11-27 14:25:47
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28630 Modified Files: sshd Log Message: let's first make sure we have all the keys we need Index: sshd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/sshd,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- sshd 11 May 2011 18:54:17 -0000 1.9 +++ sshd 27 Nov 2015 14:25:45 -0000 1.10 @@ -46,18 +46,8 @@ case "$1" in start) - if [ ! -f /etc/ssh/ssh_host_key ]; then - ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N "" - fi - if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then - ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N "" - fi - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N "" - fi - if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then - ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N "" - fi + # let's first make sure we have all the keys we need + ssh-keygen -A if [ ! -d /var/empty ]; then mkdir -p /var/empty || exit 1 |
|
From: Heiko Z. <smi...@us...> - 2015-11-26 15:51:04
|
Update of /cvsroot/devil-linux/build/config/etc/modprobe.d In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10159/modprobe.d Removed Files: modprobe.conf Log Message: remove outdated files --- modprobe.conf DELETED --- |
|
From: Heiko Z. <smi...@us...> - 2015-11-08 14:42:15
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3516 Modified Files: md5sum.lst Log Message: oops Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.765 retrieving revision 1.766 diff -u -d -r1.765 -r1.766 --- md5sum.lst 8 Nov 2015 14:38:10 -0000 1.765 +++ md5sum.lst 8 Nov 2015 14:42:13 -0000 1.766 @@ -1,6 +1,5 @@ b44cef999728712da8e6c65cecbb161d src/ClearSilver.patch.xz d08b70467ada5d5afdc12769502ed56b src/DenyHosts-2.6.tar.xz -99f72024bacdb4eb04c50c9c32640809 src/GateOne-git-20150131.tar.xz 41add821f1f958f7056fefa5081b2ea4 src/GateOne-git-20151108.tar.xz e920aadccf6c998fc9340899e95a9d3a src/GeoIP-1.6.6.tar.xz 99471c8c3f38c9264faf5c4ca7a31287 src/ImageMagick-6.9.2-0.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-11-08 14:38:12
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3327 Modified Files: md5sum.lst Log Message: updated gateone Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.764 retrieving revision 1.765 diff -u -d -r1.764 -r1.765 --- md5sum.lst 7 Nov 2015 21:12:26 -0000 1.764 +++ md5sum.lst 8 Nov 2015 14:38:10 -0000 1.765 @@ -1,6 +1,7 @@ b44cef999728712da8e6c65cecbb161d src/ClearSilver.patch.xz d08b70467ada5d5afdc12769502ed56b src/DenyHosts-2.6.tar.xz 99f72024bacdb4eb04c50c9c32640809 src/GateOne-git-20150131.tar.xz +41add821f1f958f7056fefa5081b2ea4 src/GateOne-git-20151108.tar.xz e920aadccf6c998fc9340899e95a9d3a src/GeoIP-1.6.6.tar.xz 99471c8c3f38c9264faf5c4ca7a31287 src/ImageMagick-6.9.2-0.tar.xz e308747a9ece3abf87f6b7635ed96292 src/LPRng-3.8.33.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-11-07 21:12:28
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17432 Modified Files: md5sum.lst Log Message: added dovecot-pigeonhole for sieve support Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.763 retrieving revision 1.764 diff -u -d -r1.763 -r1.764 --- md5sum.lst 7 Nov 2015 13:56:48 -0000 1.763 +++ md5sum.lst 7 Nov 2015 21:12:26 -0000 1.764 @@ -90,7 +90,8 @@ d7b276ddf103f960e9ab54f3dcc8d3dc src/docbook2X-0.8.8.tar.xz 45012f5f56f2aae3afcd62120b9e5a08 src/dosfstools-3.0.26.tar.xz e2b72c9d11f9e4d651a110c92d85edae src/dovecot-2.0-fallocate64.patch.xz -43e5b4eae37a780f49f6fb33587bbb5a src/dovecot-2.2.18.tar.xz +b2f8d67737add61b12fd991e9fe3a0f7 src/dovecot-2.2-pigeonhole-0.4.9.tar.xz +f3fef8fda953139f001c2b86262de98a src/dovecot-2.2.19.tar.xz 6f8a5d19e25d0702631d5b18ee762a9f src/dspam-3.10.2.tar.xz 3676cc63ba6d221dcc87b4ef8ef4eaaf src/dvd+rw-tools-7.1-limits.patch.xz 2b7925b0f9aa5e3d944cb8454aca66e2 src/dvd+rw-tools-7.1.tar.xz @@ -819,7 +820,7 @@ f19b1301f2554614e5961fa80a879067 src/pycurl-7.19.5.1.tar.xz 1e8ee2beacf2837cb72bd51c848d952c src/pymilter-1.0.tar.xz abfaed6a8e809b46ae5067ded57ea018 src/python-ldap-2.4.21.tar.xz -1d54892065e62bade561c00f9d153886 src/pyzor-0.9.0.tar.xz +bfbdc88744b4b49d2ffaf183f4c1271a src/pyzor-1.0.0.tar.xz b37307be70ee74e69ecf06eab6eac6e7 src/qadsl-final-1.2.tar.xz f1dce9efba8d1ca359f2998f4575206d src/quagga-0.99.24.tar.xz 1dc9569aecfbafbb3d9ef94282886501 src/quota-4.02.tar.xz |
|
From: Heiko Z. <smi...@us...> - 2015-11-07 21:11:05
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17327 Modified Files: Makefile.build Makefile.install Log Message: added dovecot-pigeonhole for sieve support Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- Makefile.build 24 Oct 2015 20:56:44 -0000 1.92 +++ Makefile.build 7 Nov 2015 21:11:02 -0000 1.93 @@ -119,7 +119,7 @@ GROUP_X := git pymilter GeoIP avahi cifs-utils kmod pwauth mod_authnz_external mod_authz_unixgroup \ shellinabox pam-abl mod_spdy netatalk opendkim backports.ssl_match_hostname certifi futures \ - pycurl html5lib GateOne ZoneMinder intltool v4l + pycurl html5lib GateOne ZoneMinder intltool v4l dovecot-pigeonhole # End of dependencies @@ -878,3 +878,5 @@ libecap: | $(GROUP_12) v4l: | linux udev + +dovecot-pigeonhole: | dovecot Python Index: Makefile.install =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.install,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Makefile.install 17 Oct 2015 20:20:05 -0000 1.51 +++ Makefile.install 7 Nov 2015 21:11:02 -0000 1.52 @@ -109,7 +109,7 @@ GROUP_X := git pymilter GeoIP avahi cifs-utils pwauth mod_authnz_external mod_authz_unixgroup \ shellinabox pam-abl mod_spdy netatalk backports.ssl_match_hostname certifi futures \ - pycurl setuptools html5lib GateOne ZoneMinder kmod + pycurl setuptools html5lib GateOne ZoneMinder kmod dovecot-pigeonhole # End of dependencies @@ -768,3 +768,4 @@ kmod: | $(GROUP_16) +dovecot-pigeonhole: | dovecot Python |
2 messages has been excluded from this view by a project administrator.
