Menu
▾
▴
[Devil-linux-commit] build CHANGES, 1.1631, 1.1632 Makefile.build, 1.101, 1.102 Makefile.install, 1.58, 1.59 md5sum.lst, 1.782, 1.783
|
From: Heiko Z. <smi...@us...> - 2016-03-06 14:14:13
|
Update of /cvsroot/devil-linux/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32018 Modified Files: CHANGES Makefile.build Makefile.install md5sum.lst Log Message: removed linux-ha (heartbeat) and replaced it with pacemaker+corosync this is the new industry standard Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- Makefile.build 3 Jan 2016 21:04:42 -0000 1.101 +++ Makefile.build 6 Mar 2016 14:14:10 -0000 1.102 @@ -41,10 +41,11 @@ 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 libnftnl + xml-security-c check libidn rpcbind libtirpc gss libnftnl libqb \ + nspr nss libstatgrab GROUP_16 := util-linux gawk groff coreutils grep gperf file \ - usbutils udev libusb libusb-compat pciutils + usbutils udev libusb libusb-compat pciutils GROUP_17 := e2fsprogs openldap postgresql \ iperf irqbalance ffmpeg pam_mount google-authenticator @@ -90,7 +91,7 @@ watchdog webalizer wget whois wireless_tools \ wol xfsprogs xinetd yp-tools \ ypbind-mt ypserv zip zisofs-tools knock gptfdisk libssh2 minidlna \ - setuptools clamav polkit mozjs nspr bareos + setuptools clamav polkit mozjs bareos GROUP_20 := DenyHosts ImageMagick MySQL-python bluez-libs \ dcc dspam \ @@ -108,8 +109,7 @@ GROUP_22 := linux net-snmp GROUP_23 := aoe6 cpqarrayd \ - cyrus-imapd \ - heartbeat iscsitarget loop-AES \ + cyrus-imapd iscsitarget loop-AES \ nagios-plugins nbd open-iscsi open-vm-tools \ php quagga vblade nut @@ -119,8 +119,8 @@ 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 cluster-glue resource-agents \ - google-authenticator-apache-module + pycurl html5lib GateOne ZoneMinder intltool v4l dovecot-pigeonhole \ + google-authenticator-apache-module corosync pacemaker # End of dependencies @@ -742,10 +742,6 @@ cyrus-imapd: | $(GROUP_22) -heartbeat: | $(GROUP_22) cluster-glue - -resource-agents: | heartbeat cluster-glue - iptables: | $(GROUP_17) libnftnl iscsitarget: | $(GROUP_22) @@ -868,7 +864,7 @@ mozjs: | $(GROUP_18) nspr -nspr: | $(GROUP_18) +nspr: | $(GROUP_14) ZoneMinder: | polkit ffmpeg perl php httpd mysql v4l @@ -894,6 +890,14 @@ dovecot-pigeonhole: | dovecot Python -cluster-glue: net-snmp Python - libnftnl: | $(GROUP_14) libxslt + +libqb: | $(GROUP_14) + +corosync: | libqb nss libstatgrab + +pacemaker: | libqb corosync + +nss: | nspr + +libstatgrab: | $(GROUP_14) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1631 retrieving revision 1.1632 diff -u -d -r1.1631 -r1.1632 --- CHANGES 1 Jan 2016 21:50:21 -0000 1.1631 +++ CHANGES 6 Mar 2016 14:14:10 -0000 1.1632 @@ -33,3 +33,5 @@ - save-config now reads /etc/sysconfig/save-config.conf to determine additional files that shoule be saved (Frank Weis) - added a new init script /etc/init.d/post_init.local to help with some initializations scripts that need to run after everything else is up - replace bacula with bareos. manual migration is necessary. + - removed Linux-HA and moved to Corosync 2.x + Pacemaker (new industry standard) + Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.782 retrieving revision 1.783 diff -u -d -r1.782 -r1.783 --- md5sum.lst 7 Feb 2016 20:44:15 -0000 1.782 +++ md5sum.lst 6 Mar 2016 14:14:10 -0000 1.783 @@ -53,7 +53,6 @@ 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 @@ -65,6 +64,7 @@ f08045f33222d2f0e046c969b391e9d9 src/compartment-type.diff.xz aa286ee14bf87e2cb173c61021f6c842 src/conntrack-tools-1.4.2.tar.xz 40efdbce865d2458d8da0a9dcee7c16c src/coreutils-8.24.tar.xz +5d39bc0c725dbbc6249eb6ef91542156 src/corosync-1.4.8.tar.gz 08a33e2ee6f5e3ec3c957a3fd72a9ad9 src/cpio-2.11.tar.xz 88c44549b3cf7361603edce124b61197 src/cpqarrayd-2.3.tar.xz bac14217bd6f6a158e523319f429e98f src/cracklib-git-20150907.tar.xz @@ -165,8 +165,6 @@ da981f86677d58a106496e68de6f8995 src/gzip-1.6.tar.xz bcff53656a888ee0710cadc4288d1d9b src/h323plus-v1_26_5.tar.xz a45c66965ec219178c83b10b4819d4a4 src/hdparm-9.48.tar.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 3dbe865c009e90d5a757113046933e0f src/hostapd-2.4.tar.xz @@ -262,7 +260,9 @@ fa8ac168bd307344357ef79e06997bc4 src/libosip2-4.1.0.tar.xz f2e889f46660adcf808446b6b6d2386f src/libpcap-1.7.4.tar.xz 7d18a74e6fd2029aee76ccd00e00a9e6 src/libpng-1.2.53.tar.xz +315d9fba00a277136a98704d22a9a790 src/libqb-git-20160305.tar.xz 358f5e3890c34ec04f8709e9877886b4 src/libssh2-1.6.0.tar.xz +b906d312076ca9be3d5188edfe07f496 src/libstatgrab-0.91.tar.gz 89697bfba923362925cf5362317edda4 src/libstdc++-compat.tar.xz cc85db5f178cbbd2adb4923ffaeb2e0e src/libtasn1-4.5.tar.xz f57a3864ba7e5caae9c7b47dbaa1eab9 src/libtirpc-git-20150919.tar.xz @@ -336,7 +336,9 @@ 2a52b4127efea9a0a0759d858dfdb401 src/noip-2.1.9-1.tar.xz d9ca45659fe27239ed7765b03d0cd319 src/nrpe-2.15.tar.xz a76297e292a94ef7b16823945e66a926 src/nsca-2.9.1.tar.xz -76923fc073c628e13472c43bc2c5ff12 src/nspr-4.10.9.tar.xz +0de760c1e00a92e180e611cf06ce9589 src/nspr-4.12.tar.gz +7899c6771eebb7bae872613856458edf src/nss-3.22.1-standalone-1.patch.xz +66175367b13bbe41295d62fce4efb88b src/nss-3.22.1.tar.gz f96ba104eb601fab0b6e67f57020f783 src/ntop-5.0.1-dl.tar.xz 7f25203b6641b19bf6f1a86c0e47df40 src/ntp-4.2.4_p6-nano.patch.xz c5bddf64fee8685ddc76fb31260ec0b2 src/ntp-4.2.8p3.tar.xz @@ -351,6 +353,7 @@ 6968d05713bb778984cb48a3009132de src/openvpn-2.3.9.tar.xz 0654a933cbebba6a304641b0ed4255a8 src/otpd-3.2.5.tar.xz 18de399550f62957cc27d2d92ed89009 src/p11-kit-0.23.1.tar.xz +2859847796149533d32a1d5f453173dd src/pacemaker-git-20160305.tar.xz e20136028e94b6571977731859f45c67 src/pam-abl-0.6.0.tar.xz 670b74c6fb8533d57f71a52658225552 src/pam-pgsql-0.7.3.2.tar.xz 89f2ef535abe27e8ad57eaea091eed95 src/pam_ldap-186.tar.xz @@ -835,7 +838,6 @@ d9d4c68b5491d21fcc58cf75759803f0 src/razor-agents-2.84.tar.xz 777bd630f6d65bbd9648b66cf45bee73 src/readline-6.3.tar.xz 66787380fb418ff7d88a23e47cda7af6 src/reiserfsprogs-3.6.24.tar.xz -10a19ae6fd952cb2f242e611afc29ae7 src/resource-agents-3.9.6.tar.xz c5548a668f5c9ada195ad2de68a35473 src/rng-tools-5.tar.xz 531f9f45b50a60f43a5eace986c74675 src/rp-pppoe-3.11.tar.xz 724dffbf90f527289c80fdead10d12ec src/rpcbind-0.2.3.tar.xz Index: Makefile.install =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.install,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- Makefile.install 3 Jan 2016 21:04:42 -0000 1.58 +++ Makefile.install 6 Mar 2016 14:14:10 -0000 1.59 @@ -91,8 +91,7 @@ GROUP_22 := linux net-snmp GROUP_23 := aoe6 cpqarrayd \ - cyrus-imapd \ - heartbeat iptables iscsitarget loop-AES \ + cyrus-imapd iptables iscsitarget loop-AES \ nagios-plugins nbd open-iscsi open-vm-tools \ php quagga vblade paxctl @@ -109,8 +108,8 @@ 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 cluster-glue \ - resource-agents google-authenticator-apache-module + pycurl setuptools html5lib GateOne ZoneMinder kmod dovecot-pigeonhole \ + google-authenticator-apache-module corosync pacemaker # End of dependencies @@ -659,10 +658,6 @@ cyrus-imapd: | $(GROUP_22) -heartbeat: | $(GROUP_22) cluster-glue - -resource-agents: | heartbeat cluster-glue - iptables: | $(GROUP_22) iscsitarget: | $(GROUP_22) @@ -781,4 +776,6 @@ dovecot-pigeonhole: | dovecot Python -cluster-glue: | Python net-snmp +corosync: linux + +pacemaker: linux corosync |
