[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0c0e24b351c5cefaae7296629e3445743a9206c6
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 0c0e24b351c5cefaae7296629e3445743a9206c6 (commit) via 454f960a02e43faff9be426deb8af9caf8f823ed (commit) via 711ad346d802a5624407d5820671b333b3f1ded7 (commit) via 78868b6e7644b7d29b17ca4930f1675126e8d1c7 (commit) via f1b0d0037a8298b0c5ac50e4f45ad18c550cb159 (commit) via bab42e5ada63dcb7b501bfc3823c3e6bfc1ad0b1 (commit) via a66da2a3953412056a469310854fecbed97f6664 (commit) via f4dda82bf59706344c47d77e60299fba151ad254 (commit) via 4ba2958f650b6ff9416aaaa4df32286bc8468286 (commit) via f0fa75b99069542b40bfe7ef35b7f126bb8040ec (commit) via 117e702b6ec1de2eedddab649d385d863c2003de (commit) via 44aa47f25ada2d2c46bf51b7527ef4908adbe36d (commit) via 1ffc449b70fa941da93a09736635c7427fe595bf (commit) via ed8fc9f1df47e259233cac32791162e3f95d9542 (commit) via f6a0ff406a4114e8bd4ff54fb3fad2b2769dffa9 (commit) via 400ccb0b4fa595126e781d597e91947b11493bb8 (commit) via 9589c5a1d96c1e7dae2ce3a1621095f8d73c5913 (commit) via c257ba3207e0d5607c35d55f403db5ffd28f940c (commit) via 36369ddb53341b49924ed63fecf9746c0e0c84b8 (commit) from 8a783036e55f6b4ca9fbd0bbadbdf805a943929f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0c0e24b351c5cefaae7296629e3445743a9206c6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 10:25:42 2023 +0000
bricklayer: New package
Our new shiny installer package...
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 454f960a02e43faff9be426deb8af9caf8f823ed Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Feb 22 11:14:16 2023 +0100
nfs-utils: Requires libtirpc with gss suport to built
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 711ad346d802a5624407d5820671b333b3f1ded7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Feb 22 11:14:15 2023 +0100
libtirc: Build with gss support
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 78868b6e7644b7d29b17ca4930f1675126e8d1c7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 19:51:52 2023 +0100
crontabs: Update to snap_release 20190603
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f1b0d0037a8298b0c5ac50e4f45ad18c550cb159 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 19:31:46 2023 +0100
jwhois: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bab42e5ada63dcb7b501bfc3823c3e6bfc1ad0b1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 19:31:45 2023 +0100
whois: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a66da2a3953412056a469310854fecbed97f6664 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 18:27:08 2023 +0100
fuse-sshfs: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f4dda82bf59706344c47d77e60299fba151ad254 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 18:27:07 2023 +0100
keepalived: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4ba2958f650b6ff9416aaaa4df32286bc8468286 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 18:27:06 2023 +0100
ipvsadm: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f0fa75b99069542b40bfe7ef35b7f126bb8040ec Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 16:16:47 2023 +0100
igmpproxy: Update to 0.4
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 117e702b6ec1de2eedddab649d385d863c2003de Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 15:45:06 2023 +0100
libnfsidmap: Drop package
This package now will be provided by the nfs-utils package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 44aa47f25ada2d2c46bf51b7527ef4908adbe36d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 16:03:39 2023 +0100
libgssglue: Drop package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1ffc449b70fa941da93a09736635c7427fe595bf Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 16:03:38 2023 +0100
libtirpc: Does not depend on libgssglue
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ed8fc9f1df47e259233cac32791162e3f95d9542 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 16:03:37 2023 +0100
nfs-utils: Does not depend on libgssglue
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f6a0ff406a4114e8bd4ff54fb3fad2b2769dffa9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 15:45:51 2023 +0100
nfs-utils: Update to 2.6.2
* Provides libnfsidmap packages from now * Drop systemd files because the package contains their own
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 400ccb0b4fa595126e781d597e91947b11493bb8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 15:45:50 2023 +0100
keyutils: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9589c5a1d96c1e7dae2ce3a1621095f8d73c5913 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 21 14:26:41 2023 +0100
librpcsecgss: Drop package
Deprecated, No relaese since 2009, Not longer used.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c257ba3207e0d5607c35d55f403db5ffd28f940c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 09:36:19 2023 +0000
perl-common-sense: Update to 3.75
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 36369ddb53341b49924ed63fecf9746c0e0c84b8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 09:27:25 2023 +0000
gcc: Build with SSP by default and disable LTO during build
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: bricklayer/bricklayer.nm | 89 ++++ crontabs/crontabs.nm | 8 +- fuse-sshfs/fuse-sshfs.nm | 44 -- gcc/gcc.nm | 9 +- igmpproxy/igmpproxy.nm | 18 +- ipvsadm/ipvsadm.nm | 47 -- ipvsadm/patches/build-flags.patch | 26 -- jwhois/jwhois.nm | 48 -- jwhois/patches/jwhois-4.0-conf.patch | 47 -- jwhois/patches/jwhois-4.0-conf_update.patch | 482 --------------------- jwhois/patches/jwhois-4.0-conf_update2.patch | 90 ---- jwhois/patches/jwhois-4.0-conf_update3.patch | 61 --- jwhois/patches/jwhois-4.0-conf_update4.patch | 168 ------- jwhois/patches/jwhois-4.0-connect.patch | 58 --- jwhois/patches/jwhois-4.0-dotster.patch | 13 - jwhois/patches/jwhois-4.0-enum.patch | 43 -- jwhois/patches/jwhois-4.0-fclose.patch | 12 - jwhois/patches/jwhois-4.0-gi.patch | 12 - jwhois/patches/jwhois-4.0-ipv6match.patch | 15 - keepalived/keepalived.nm | 80 ---- .../keepalived-1.2.7-dont-respawn-children.patch | 109 ----- .../keepalived-1.2.7-fix-error-message.patch | 40 -- ...-1.2.7-fix-pointer-arithmetic-vrrp-packet.patch | 32 -- ...d-1.2.7-fix-primary-ip-address-comparison.patch | 34 -- ...keepalived-1.2.7-fix-ssl-certificate-load.patch | 34 -- .../keepalived-1.2.7-remove-debug-messages.patch | 46 -- .../keepalived-1.2.7-update-gpl-license.patch | 146 ------- ...epalived-1.2.7-update-keepalived-man-page.patch | 201 --------- keepalived/systemd/keepalived.service | 12 - keyutils/keyutils.nm | 76 ++++ libgssglue/libgssglue.nm | 33 -- libnfsidmap/libnfsidmap.nm | 58 --- libnfsidmap/patches/libnfsidmap-0.26-rc1.patch | 77 ---- librpcsecgss/librpcsecgss.nm | 41 -- libtirpc/libtirpc.nm | 7 +- nfs-utils/nfs-utils.nm | 30 +- nfs-utils/systemd/nfs-blkmap.service | 12 - nfs-utils/systemd/nfs-idmap.service | 12 - nfs-utils/systemd/nfs-lock.service | 14 - nfs-utils/systemd/nfs-mountd.service | 12 - nfs-utils/systemd/nfs-rquotad.service | 12 - nfs-utils/systemd/nfs-secure-server.service | 13 - nfs-utils/systemd/nfs-secure.service | 12 - nfs-utils/systemd/nfs-server.service | 18 - nfs-utils/systemd/nfs.target | 7 - nfs-utils/systemd/proc-fs-nfsd.mount | 8 - nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount | 8 - perl-common-sense/perl-common-sense.nm | 10 +- whois/whois.nm | 60 +++ 49 files changed, 276 insertions(+), 2268 deletions(-) create mode 100644 bricklayer/bricklayer.nm delete mode 100644 fuse-sshfs/fuse-sshfs.nm delete mode 100644 ipvsadm/ipvsadm.nm delete mode 100644 ipvsadm/patches/build-flags.patch delete mode 100644 jwhois/jwhois.nm delete mode 100644 jwhois/patches/jwhois-4.0-conf.patch delete mode 100644 jwhois/patches/jwhois-4.0-conf_update.patch delete mode 100644 jwhois/patches/jwhois-4.0-conf_update2.patch delete mode 100644 jwhois/patches/jwhois-4.0-conf_update3.patch delete mode 100644 jwhois/patches/jwhois-4.0-conf_update4.patch delete mode 100644 jwhois/patches/jwhois-4.0-connect.patch delete mode 100644 jwhois/patches/jwhois-4.0-dotster.patch delete mode 100644 jwhois/patches/jwhois-4.0-enum.patch delete mode 100644 jwhois/patches/jwhois-4.0-fclose.patch delete mode 100644 jwhois/patches/jwhois-4.0-gi.patch delete mode 100644 jwhois/patches/jwhois-4.0-ipv6match.patch delete mode 100644 keepalived/keepalived.nm delete mode 100644 keepalived/patches/keepalived-1.2.7-dont-respawn-children.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-fix-error-message.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-fix-pointer-arithmetic-vrrp-packet.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-fix-primary-ip-address-comparison.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-fix-ssl-certificate-load.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-remove-debug-messages.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-update-gpl-license.patch delete mode 100644 keepalived/patches/keepalived-1.2.7-update-keepalived-man-page.patch delete mode 100644 keepalived/systemd/keepalived.service create mode 100644 keyutils/keyutils.nm delete mode 100644 libgssglue/libgssglue.nm delete mode 100644 libnfsidmap/libnfsidmap.nm delete mode 100644 libnfsidmap/patches/libnfsidmap-0.26-rc1.patch delete mode 100644 librpcsecgss/librpcsecgss.nm delete mode 100644 nfs-utils/systemd/nfs-blkmap.service delete mode 100644 nfs-utils/systemd/nfs-idmap.service delete mode 100644 nfs-utils/systemd/nfs-lock.service delete mode 100644 nfs-utils/systemd/nfs-mountd.service delete mode 100644 nfs-utils/systemd/nfs-rquotad.service delete mode 100644 nfs-utils/systemd/nfs-secure-server.service delete mode 100644 nfs-utils/systemd/nfs-secure.service delete mode 100644 nfs-utils/systemd/nfs-server.service delete mode 100644 nfs-utils/systemd/nfs.target delete mode 100644 nfs-utils/systemd/proc-fs-nfsd.mount delete mode 100644 nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount create mode 100644 whois/whois.nm
Difference in files: diff --git a/bricklayer/bricklayer.nm b/bricklayer/bricklayer.nm new file mode 100644 index 000000000..2e0f6e96e --- /dev/null +++ b/bricklayer/bricklayer.nm @@ -0,0 +1,89 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = bricklayer +version = 0.0.1 +release = 0.1 + +groups = Installer +url = https://git.ipfire.org/?p=people/ms/bricklayer.git;a=summary +license = GPLv2 +summary = Installer for IPFire + +description + Bricklayer is the installer program for IPFire. + + It can create bootable images, ISO images and conduct the first + steps of setting up the system. +end + +source_dl = https://source.ipfire.org/releases/bricklayer/ + +build + requires + asciidoc + autoconf + automake + gettext + intltool + pakfire >= 0.9.27-2 + python3 + python3-devel + python3-parted + python3-pytz + python3-snack >= 0.52.21-1 + python3-systemd + systemd-devel + end + + prepare_cmds + # Generate the build system, if this was not a release + # tarball. + [ -x "configure" ] || sh ./autogen.sh + end +end + +packages + package %{name} + requires + pakfire + python3 + python3-parted + python3-pytz + python3-snack + python3-systemd + + # Filesystem Tools + btrfs-progs + dosfstools + util-linux + + # User Management + shadow-utils + end + end + + package %{name}-master + summary = Tools to master a bootable CD image + + description + %{name} contains tools to master a bootable + CD image which can be used to install IPFire. + end + + files + %{bindir}/bricklayer-master + end + + requires + bricklayer = %{thisver} + coreutils + grub + pakfire + squashfs-tools + xorriso + end + end +end diff --git a/crontabs/crontabs.nm b/crontabs/crontabs.nm index e17811f41..571f530d7 100644 --- a/crontabs/crontabs.nm +++ b/crontabs/crontabs.nm @@ -5,12 +5,12 @@
name = crontabs version = 1.11 -snap_rel = 20121102git +snap_rel = 20190603 release = 1.%{snap_rel} arch = noarch
groups = System/Base -url = https://fedorahosted.org/crontabs +url = https://github.com/cronie-crond/crontabs license = Public Domain and GPLv2 summary = Root crontab files used to schedule the execution of programs.
@@ -27,8 +27,8 @@ description your system. end
-source_dl = https://fedorahosted.org/releases/c/r/crontabs/ -sources = %{name}-%{version}-1.%{snap_rel}.tar.gz +source_dl = https://github.com/cronie-crond/crontabs/releases/download/crontabs-%%7Bsnap... +sources = %{name}-%{version}-%{snap_rel}git.tar.gz
build build diff --git a/fuse-sshfs/fuse-sshfs.nm b/fuse-sshfs/fuse-sshfs.nm deleted file mode 100644 index fab5b72ad..000000000 --- a/fuse-sshfs/fuse-sshfs.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = fuse-sshfs -version = 2.2 -release = 1 - -groups = System/Filesystems -url = http://fuse.sourceforge.net/sshfs.html -license = GPLv2 -summary = FUSE-Filesystem to access remote filesystems via SSH. - -description - This is a FUSE-filesystem client based on the SSH File Transfer Protocol. - Since most SSH servers already support this protocol it is very easy to set - up: i.e. on the server side there's nothing to do. On the client side - mounting the filesystem is as easy as logging into the server with ssh. -end - -source_dl = -sources = sshfs-fuse-%{version}.tar.gz - -build - requires - fuse-devel - glib2-devel - openssh-clients - end - - DIR_APP = %{DIR_SRC}/sshfs-fuse-%{version} -end - -packages - package %{name} - provides = sshfs=%{thisver} - requires = openssh-clients - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 485abbe12..2ac8665a3 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_graphite = 1
name = gcc version = 12.2.0 -release = 1 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -24,8 +24,7 @@ end # This is the at least required version of binutils. binutils_version = 2.35
-source_dl = http://ftp.gnu.org/gnu/gcc/%%7Bthisapp%7D/ -source_dl += ftp://gcc.gnu.org/pub/gcc/infrastructure/ +source_dl = https://ftp.gnu.org/gnu/gcc/%%7Bthisapp%7D/ sources = %{thisapp}.tar.gz
build @@ -123,6 +122,9 @@ build export CC=gcc export CXX=g++
+ # Disable LTO + LTO_CFLAGS = + build cd %{DIR_SRC}/gcc-build
@@ -166,6 +168,7 @@ build --disable-bootstrap \ --enable-checking=release \ --enable-default-pie \ + --enable-default-ssp \ --disable-werror \ --disable-libssp \ --with-system-zlib \ diff --git a/igmpproxy/igmpproxy.nm b/igmpproxy/igmpproxy.nm index 12e842c56..208229db1 100644 --- a/igmpproxy/igmpproxy.nm +++ b/igmpproxy/igmpproxy.nm @@ -4,11 +4,11 @@ ###############################################################################
name = igmpproxy -version = 0.1 +version = 0.4 release = 1
groups = Networking/Routing -url = http://sourceforge.net/projects/igmpproxy/ +url = https://github.com/pali/igmpproxy license = GPLv2+ summary = A proxy for IGMP.
@@ -18,16 +18,24 @@ description between networks. end
-source_dl = +source_dl = https://github.com/pali/%%7Bname%7D/archive/refs/tags/%%7Bversion%7D.tar.gz#...
build + requires + autoconf + automake + end + configure_options += \ - --sysconfdir=/etc + --sysconfdir=%{sysconfdir} + + prepare_cmds + ./autogen.sh + end end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/ipvsadm/ipvsadm.nm b/ipvsadm/ipvsadm.nm deleted file mode 100644 index 4986ca20d..000000000 --- a/ipvsadm/ipvsadm.nm +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = ipvsadm -version = 1.31 -release = 1 - -groups = Applications/System -url = https://www.linuxvirtualserver.org/software/ipvs.html -license = GPLv2+ -summary = Utility to administer the Linux Virtual Server. - -description - ipvsadm is a utility to administer the IP Virtual Server services - offered by the Linux kernel. -end - -source_dl = https://kernel.org/pub/linux/utils/kernel/ipvsadm/ - -build - requires - libnl3-devel - popt-devel - end - - PARALLELISMFLAGS = # parallel build not supported - - make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" - - make_install_targets += BUILD_ROOT="%{BUILDROOT}" \ - SBIN="%{BUILDROOT}%{sbindir}" MANDIR="%{mandir}" - - install_cmds - # Remove unwanted files. - rm -vfr %{BUILDROOT}/etc - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/ipvsadm/patches/build-flags.patch b/ipvsadm/patches/build-flags.patch deleted file mode 100644 index bc0899573..000000000 --- a/ipvsadm/patches/build-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile b/Makefile -index 91a2991..1d27655 100644 ---- a/Makefile -+++ b/Makefile -@@ -87,7 +87,7 @@ libs: - make -C libipvs - - ipvsadm: $(OBJS) $(STATIC_LIBS) -- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - install: all - if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi -diff --git a/libipvs/Makefile b/libipvs/Makefile -index f845c8b..46cd4eb 100644 ---- a/libipvs/Makefile -+++ b/libipvs/Makefile -@@ -33,7 +33,7 @@ $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o - ar rv $@ $^ - - $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o -- $(CC) -shared -Wl,-soname,$@ -o $@ $^ -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^ - - %.o: %.c - $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< diff --git a/jwhois/jwhois.nm b/jwhois/jwhois.nm deleted file mode 100644 index cfe605a4e..000000000 --- a/jwhois/jwhois.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = jwhois -version = 4.0 -release = 1 - -groups = Applications/Internet -url = http://www.gnu.org/software/jwhois/ -license = GPLv3 -summary = Internet whois/nicname client. - -description - A whois client that accepts both traditional and finger-style queries. -end - -source_dl = -sources = %{thisapp}.tar.gz - -patches = %{thisapp}-connect.patch -patches += %{thisapp}-ipv6match.patch -patches += %{thisapp}-enum.patch -patches += %{thisapp}-fclose.patch -patches += %{thisapp}-conf.patch -patches += %{thisapp}-gi.patch -patches += %{thisapp}-conf_update.patch -patches += %{thisapp}-conf_update2.patch -patches += %{thisapp}-dotster.patch -patches += %{thisapp}-conf_update3.patch -patches += %{thisapp}-conf_update4.patch - -build - requires - gdbm-devel - end - - configure_options += --sysconfdir=/etc -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/jwhois/patches/jwhois-4.0-conf.patch b/jwhois/patches/jwhois-4.0-conf.patch deleted file mode 100644 index 7de452dc9..000000000 --- a/jwhois/patches/jwhois-4.0-conf.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf_old jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf_old 2007-03-26 11:12:08.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf 2008-10-13 14:43:48.000000000 +0200 -@@ -593,13 +593,12 @@ cidr6-blocks { - "2001:1600::/23" = "whois.ripe.net"; - "2001:1800::/23" = "whois.arin.net"; - "2001:1A00::/23" = "whois.ripe.net"; -- "2001:1C00::/23" = "whois.ripe.net"; -- "2001:1E00::/23" = "whois.ripe.net"; -+ "2001:1C00::/22" = "whois.ripe.net"; - "2001:2000::/20" = "whois.ripe.net"; - "2001:3000::/21" = "whois.ripe.net"; - "2001:3800::/22" = "whois.ripe.net"; - "2001:4000::/23" = "whois.ripe.net"; -- "2001:4200::/23" = "whois.arin.net"; -+ "2001:4200::/23" = "whois.afrinic.net"; - "2001:4400::/23" = "whois.apnic.net"; - "2001:4600::/23" = "whois.ripe.net"; - "2001:4800::/23" = "whois.arin.net"; -@@ -612,21 +611,15 @@ cidr6-blocks { - - "2003:0000::/18" = "whois.ripe.net"; - -- "2400:0000::/19" = "whois.apnic.net"; -- "2400:2000::/19" = "whois.apnic.net"; -- "2400:4000::/21" = "whois.apnic.net"; -- "2404:0000::/23" = "whois.apnic.net"; -- -- "2600:0000::/22" = "whois.arin.net"; -- "2604:0000::/22" = "whois.arin.net"; -- "2608:0000::/22" = "whois.arin.net"; -- "260C:0000::/22" = "whois.arin.net"; -+ "2400:0000::/12" = "whois.apnic.net"; -+ -+ "2600:0000::/12" = "whois.arin.net"; - "2610:0000::/23" = "whois.arin.net"; -+ "2620:0000::/23" = "whois.arin.net"; - -- "2800:0000::/23" = "whois.lacnic.net"; -+ "2800:0000::/12" = "whois.lacnic.net"; - -- "2A00:0000::/21" = "whois.ripe.net"; -- "2A01:0000::/16" = "whois.ripe.net"; -+ "2C00:0000::/12" = "whois.afrinic.net"; - - # - # Experimental IPv6 network 6bone (RFC2471) diff --git a/jwhois/patches/jwhois-4.0-conf_update.patch b/jwhois/patches/jwhois-4.0-conf_update.patch deleted file mode 100644 index f3457e24c..000000000 --- a/jwhois/patches/jwhois-4.0-conf_update.patch +++ /dev/null @@ -1,482 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf.conf_update jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf.conf_update 2009-02-27 10:17:01.000000000 +0100 -+++ jwhois-4.0/example/jwhois.conf 2009-02-27 10:57:26.000000000 +0100 -@@ -32,6 +32,7 @@ whois-servers { - "^CORE-[0-9]+$" = "struct handles"; - "^CO[CH]O-[0-9]+$" = "struct handles"; - ".*-[A-Z]+$" = "struct handles"; -+ ".*-6BONE$" = "struct handles"; - - # - # Catch AS numbers -@@ -86,6 +87,7 @@ whois-servers { - # Pseudo-ccTLDs must be listed above gTLDs - # - "\.ae\.org$" = "whois.centralnic.net"; -+ "\.ar\.com$" = "whois.centralnic.com"; - "\.br\.com$" = "whois.centralnic.net"; - "\.cn\.com$" = "whois.centralnic.net"; - "\.de\.com$" = "whois.centralnic.net"; -@@ -108,17 +110,21 @@ whois-servers { - "\.uy\.com$" = "whois.centralnic.net"; - "\.web\.com$" = "whois.centralnic.net"; - "\.za\.com$" = "whois.centralnic.net"; -+ "\.za\.net$" = "whois.za.net"; -+ "\.za\.org$" = "whois.za.org"; - - "\.ac$" = "whois.nic.ac"; -- "\.ae$" = "whois.uaenic.ae"; -+ "\.ae$" = "whois.aeda.net.ae"; - "\.aero$" = "whois.aero"; -- "\.af$" = "whois.nic.af"; -+ "\.af$" = "whois.cocca.cx"; - "\.ag$" = "whois.nic.ag"; -- "\.ai$" = "whois.offshore.ai"; -+ "\.ai$" = "whois.ai"; - "\.al$" = "whois.ripe.net"; - "\.am$" = "whois.amnic.net"; - "\.ar$" = "www.nic.ar"; -+ "\.arpa$" = "whois.iana.org"; - "\.as$" = "whois.nic.as"; -+ "\.asia$" = "whois.nic.asia"; - "\.at$" = "whois.nic.at"; - "\.asn\.au$" = "whois.ausregistry.net.au"; - "\.com\.au$" = "whois.ausregistry.net.au"; -@@ -130,25 +136,33 @@ whois-servers { - "\.ba$" = "whois.ripe.net"; - "\.be$" = "whois.dns.be"; - "\.bg$" = "whois.register.bg"; -- "\.bi$" = "www.nic.bi"; -- "\.biz$" = "whois.neulevel.biz"; -+ "\.bi$" = "whois.nic.bi"; -+ "\.biz$" = "whois.biz"; - "\.bj$" = "whois.nic.bj"; - "\.bm$" = "rwhois.ibl.bm 4321"; -+ "\.bo$" = "whois.nic.bo"; - "\.br$" = "whois.nic.br"; - "\.bv$" = "whois.ripe.net"; - "\.by$" = "whois.ripe.net"; - "\.bz$" = "whois.belizenic.bz"; -+ "\.co\.ca$" = "whois.co.ca"; - "\.ca$" = "whois.cira.ca"; - "\.cat$" = "whois.cat"; -- "\.cc$" = "whois.nic.cc"; -+ "\.cc$" { -+ whois-server = "ccwhois.verisign-grs.com"; -+ query-format = "domain $*"; -+ } - "\.cd$" = "whois.nic.cd"; - "\.cg$" = "www.nic.cg"; - "\.ch$" = "whois.nic.ch"; - "\.ci$" = "whois.nic.ci"; - "\.ck$" = "whois.nic.ck"; - "\.cl$" = "whois.nic.cl"; -+ "\.co\.cm$" = "whois.netcom.cm"; -+ "\.com\.cm$" = "whois.netcom.cm"; -+ "\.net\.cm$" = "whois.netcom.cm"; - "\.edu\.cn$" = "whois.edu.cn"; -- "\.cn$" = "whois.cnnic.net.cn"; -+ "\.cn$" = "whois.cnnic.cn"; - "\.com$" { - whois-server = "whois.verisign-grs.com"; - query-format = "domain $*"; -@@ -166,7 +180,7 @@ whois-servers { - "\.do$" = "whois.nic.do"; - "\.dz$" = "whois.ripe.net"; - "\.ec$" = "www.nic.ec"; -- "\.edu$" = "whois.educause.net"; -+ "\.edu$" = "whois.educause.edu"; - "\.ee$" = "whois.eenet.ee"; - "\.eg$" = "whois.ripe.net"; - "\.es$" = "www.nic.es"; -@@ -176,17 +190,20 @@ whois-servers { - "\.fm$" = "www.dot.fm"; - "\.fo$" = "whois.ripe.net"; - "\.fr$" = "whois.nic.fr"; -+ "\.gd$" = "whois.adamsnames.com"; - "\.gi$" = "whois2.afilias-grs.net"; - "\.gov$" = "whois.nic.gov"; -- "\.gg$" = "whois.isles.net"; -+ "\.gg$" = "whois.gg"; - "\.gm$" = "whois.ripe.net"; - "\.gp$" = "whois.nic.gp"; - "\.gr$" = "whois.ripe.net"; -- "\.gs$" = "203.119.12.22"; -+ "\.gs$" = "whois.nic.gs"; - "\.gt$" = "www.gt"; -- "\.hk$" = "whois.hkdnr.net.hk"; -+ "\.hk$" = "whois.hkirc.hk"; - "\.hm$" = "whois.registry.hm"; -+ "\.hn$" = "whois2.afilias-grs.net"; - "\.hr$" = "www.dns.hr"; -+ "\.ht$" = "whois.nic.ht"; - "\.hu$" = "whois.nic.hu"; - "\.id$" = "whois.idnic.net.id"; - "\.ie$" = "whois.domainregistry.ie"; -@@ -200,29 +217,39 @@ whois-servers { - "\.is$" = "whois.isnic.is"; - "\.it$" = "whois.nic.it"; - "\.je$" = "whois.isles.net"; -+ "\.jobs$" { -+ whois-server = "jobswhois.verisign-grs.com"; -+ query-format = "domain $*"; -+ } - "\.jp$" { - whois-server = "whois.jprs.jp"; - query-format = "$* /e"; - } -+ "\.ke$" = "whois.kenic.or.ke"; -+ "\.kp$" = "whois.kcce.kp"; - "\.kg$" = "whois.domain.kg"; -- "\.ki$" = "whois.nic.ki"; -+ "\.ki$" = "whois.cocca.cx"; - "\.kr$" = "whois.krnic.net"; - "\.kz$" = "whois.nic.kz"; - "\.la$" = "whois.nic.la"; - "\.lb$" = "cgi.aub.edu.lb"; -+ "\.lc$" = "whois2.afilias-grs.net"; - "\.li$" = "whois.nic.li"; - "\.lk$" = "whois.nic.lk"; - "\.lt$" = "whois.domreg.lt"; - "\.lu$" = "whois.dns.lu"; - "\.lv$" = "whois.nic.lv"; - "\.ly$" = "whois.nic.ly"; -- "\.ma$" = "whois.ripe.net"; -+ "\.ma$" = "whois.iam.net.ma"; -+ "\.md$" = "whois.nic.md"; -+ "\.me$" = "whois.nic.me"; - "\.mil$" = "whois.nic.mil"; - "\.mk$" = "whois.ripe.net"; - "\.mm$" = "whois.nic.mm"; -+ "\.mn$" = "whois2.afilias-grs.net"; - "\.mobi$" = "whois.dotmobiregistry.net"; -- "\.ms$" = "whois.adamsnames.tc"; -- "\.mt$" = "www.um.edu.mt"; -+ "\.ms$" = "whois.nic.ms"; -+ "\.mt$" = "whois.nic.org.mt"; - "\.mu$" = "whois.nic.mu"; - "\.museum$" = "whois.museum"; - "\.mw$" = "www.tarsus.net"; -@@ -234,31 +261,37 @@ whois-servers { - whois-server = "whois.verisign-grs.com"; - query-format = "domain $*"; - } -+ "\.nf$" = "whois.cocca.cx"; - "\.ng$" = "whois.rg.net"; - "\.nl$" = "whois.domain-registry.nl"; - "\.no$" = "whois.norid.no"; - "\.nu$" = "whois.nic.nu"; - "\.nz$" = "whois.srs.net.nz"; - "\.org$" = "whois.publicinterestregistry.net"; -- "\.pe$" = "whois.nic.pe"; -+ "\.pe$" = "kero.yachay.pe"; - "\.pk$" = "pknic.net.pk"; - "\.pl$" = "whois.dns.pl"; - "\.pm$" = "whois.nic.pm"; -+ "\.pr$" = "whois.nic.pr"; - "\.pro$" = "whois.registrypro.pro"; - "\.pt$" = "whois.dns.pt"; - "\.pw$" = "whois.nic.pw"; - "\.re$" = "whois.nic.re"; - "\.ro$" = "whois.rotld.ro"; -+ "\.edu.ru$" = "whois.informika.ru"; - "\.ru$" = "whois.ripn.net"; - "\.rw$" = "www.nic.rw"; - "\.sa$" = "saudinic.net.sa"; -+ "\.sb$" = "whois.nic.sb"; -+ "\.sc$" = "whois2.afilias-grs.net"; - "\.se$" = "whois.iis.se"; - "\.sg$" = "whois.nic.net.sg"; - "\.sh$" = "whois.nic.sh"; - "\.si$" = "whois.arnes.si"; - "\.sj$" = "whois.ripe.net"; -- "\.sk$" = "whois.ripe.net"; -+ "\.sk$" = "whois.sk-nic.sk"; - "\.sm$" = "whois.ripe.net"; -+ "\.sn$" = "whois.nic.sn"; - "\.sr$" = "whois.register.sr"; - "\.st$" = "whois.nic.st"; - "\.su$" = "whois.ripn.net"; -@@ -273,8 +306,12 @@ whois-servers { - "\.tn$" = "whois.ripe.net"; - "\.to$" = "whois.tonic.to"; - "\.tr$" = "whois.nic.tr"; -+ "\.travel$" = "whois.nic.travel"; - "\.tt$" = "www.nic.tt"; -- "\.tv$" = "whois.nic.tv"; -+ "\.tv$" { -+ whois-server = "tvwhois.verisign-grs.com"; -+ query-format = "domain $*"; -+ } - "\.tw$" = "whois.twnic.net"; - "\.ua$" = "whois.com.ua"; - "\.ug$" = "whois.co.ug"; -@@ -285,8 +322,11 @@ whois-servers { - "\.us$" = "whois.nic.us"; - "\.com\.uy$" = "dns.antel.net.uy"; - "\.uy$" = "www.rau.edu.uy"; # is a whois server -- "\.uz$" = "www.noc.uz"; -+ "\.co\.uz$" = "whois.reg.uz"; -+ "\.com\.uz$" = "whois.reg.uz"; -+ "\.uz$" = "whois.cctld.uz"; - "\.va$" = "whois.ripe.net"; -+ "\.vc$" = "whois2.afilias-grs.net"; - "\.ve$" = "whois.nic.ve"; - "\.vi$" = "www.nic.vi"; - "\.vg$" = "whois.adamsnames.tc"; -@@ -299,6 +339,7 @@ whois-servers { - "\.ac\.za$" = "whois.ac.za"; - "\.org\.za$" = "rwhois.org.za 4321"; - "\.co\.za$" = "whois.co.za"; -+ "\.nom\.za$" = "www.nom.za"; - # "\.za$" = "whois.frd.ac.za"; - - # -@@ -594,7 +635,7 @@ cidr-blocks { - cidr6-blocks { - type = cidr6; - -- "2001:0000::/23" = "whois.iana.org"; -+ "2001:0000::/23" = "whois.iana.org"; # correct, but nothing usable is returned - "2001:0200::/23" = "whois.apnic.net"; - "2001:0400::/23" = "whois.arin.net"; - "2001:0600::/23" = "whois.ripe.net"; -@@ -611,6 +652,7 @@ cidr6-blocks { - "2001:2000::/20" = "whois.ripe.net"; - "2001:3000::/21" = "whois.ripe.net"; - "2001:3800::/22" = "whois.ripe.net"; -+ "2001:3C00::/22" = "whois.arin.net"; # not correct, but shows better information - "2001:4000::/23" = "whois.ripe.net"; - "2001:4200::/23" = "whois.afrinic.net"; - "2001:4400::/23" = "whois.apnic.net"; -@@ -623,6 +665,8 @@ cidr6-blocks { - "2001:A000::/20" = "whois.apnic.net"; - "2001:B000::/20" = "whois.apnic.net"; - -+ "2002:0000::/16" = "whois.arin.net"; # not correct, but shows better information -+ - "2003:0000::/18" = "whois.ripe.net"; - - "2400:0000::/12" = "whois.apnic.net"; -@@ -636,6 +680,34 @@ cidr6-blocks { - "2C00:0000::/12" = "whois.afrinic.net"; - - # -+ # IPv6 blocks by carriers used for SixXS; -+ # see e.g. http://www.sixxs.net/pops/ -+ # -+ "2001:0610::/32" = "whois.sixxs.net"; -+ "2001:06A0::/32" = "whois.sixxs.net"; -+ "2001:06A8::/32" = "whois.sixxs.net"; -+ "2001:06F8::/32" = "whois.sixxs.net"; -+ "2001:0770::/32" = "whois.sixxs.net"; -+ "2001:07B8::/32" = "whois.sixxs.net"; -+ "2001:0808::/32" = "whois.sixxs.net"; -+ "2001:0838::/32" = "whois.sixxs.net"; -+ "2001:0960::/32" = "whois.sixxs.net"; -+ "2001:0A60::/32" = "whois.sixxs.net"; -+ "2001:0AD0::/32" = "whois.sixxs.net"; -+ "2001:0B18::/32" = "whois.sixxs.net"; -+ "2001:1418::/32" = "whois.sixxs.net"; -+ "2001:14B8::/32" = "whois.sixxs.net"; -+ "2001:15C0::/32" = "whois.sixxs.net"; -+ "2001:16D8::/32" = "whois.sixxs.net"; -+ "2001:1938::/32" = "whois.sixxs.net"; -+ "2001:4830::/32" = "whois.sixxs.net"; -+ "2001:4978::/32" = "whois.sixxs.net"; -+ "2001:41E0::/32" = "whois.sixxs.net"; -+ "2001:4428::/32" = "whois.sixxs.net"; -+ "2A01:0198::/32" = "whois.sixxs.net"; -+ "2A01:0348::/32" = "whois.sixxs.net"; -+ -+ # - # Experimental IPv6 network 6bone (RFC2471) - # Phaseout at Jun, 6 2006 (RFC3701) - # -@@ -678,6 +750,33 @@ handles { - whois-server = "saudinic.net.sa"; - query-format = "PERSON $*"; - } -+ ".*-SIXXS$" = "whois.sixxs.net"; -+ ".*-6BONE$" = "whois.6bone.net"; -+ ".*-IRNIC$" = "whois.nic.ir"; -+ ".*-RIPN$" = "whois.ripn.net"; -+ ".*-AFRINIC$" = "whois.afrinic.net"; -+ "^C[0-9]+-LRMS$" { -+ whois-server = "whois.afilias.info"; -+ query-format = "CONTACT ID $*"; -+ } -+ "^D[0-9]+-LRMS$" { -+ whois-server = "whois.afilias.info"; -+ query-format = "DOMAIN ID $*"; -+ } -+ "^H[0-9]+-LRMS$" { -+ whois-server = "whois.afilias.info"; -+ query-format = "HOST ID $*"; -+ } -+ "^R[0-9]+-LRMS$" { -+ whois-server = "whois.afilias.info"; -+ query-format = "REGISTRAR ID $*"; -+ } -+ ".*-KENIC$" = "whois.kenic.or.ke"; -+ ".*-UANIC$" = "whois.com.ua"; -+ ".*-COOP$" { -+ whois-server = "whois.nic.coop"; -+ query-format = "CONTACT $*"; -+ } - } - - # -@@ -685,11 +784,6 @@ handles { - # each host. - # - server-options { -- "rwhois\.nic\.ve" { -- rwhois = true; -- rwhois-display = "dump"; -- rwhois-limit = 10; -- } - "rwhois\.exodus\.net" { - rwhois = true; - } -@@ -761,13 +855,6 @@ server-options { - form-element = "name"; - } - -- "www\.um\.edu\.mt" { -- http = "true"; -- http-method = "GET"; -- http-action = "/cgi-bin/nic/whois"; -- form-element = "domain"; -- } -- - "www\.gt" { - http = "true"; - http-method = "GET"; -@@ -784,13 +871,6 @@ server-options { - query-format = "Upit=${+2}"; # All but last domain segment - } - -- "whois\.offshore\.ai" { -- http = "true"; -- http-method = "POST"; -- http-action = "/cgi-bin/whois.pl"; -- form-element = "domain-name"; -- } -- - "www\.io\.io" { - http = "true"; - http-method = "GET"; -@@ -820,11 +900,12 @@ server-options { - form-element = "query"; - } - -- "www\.nic\.bi" { -- http = "true"; -- http-method = "POST"; -- http-action = "/cgi-bin/whoisbi.pl"; # Formatting problems in Lynx -- form-element = "DOMAINWHOIS"; -+ "whois\.nic\.bi" { -+ http = "true"; # I can't connect on port 43 -+ http-method = "GET"; -+ http-action = "/register/whois.hei"; -+ form-element = "query"; -+ form-extra = "type=domain"; - } - - "www\.nic\.cg" { -@@ -855,13 +936,6 @@ server-options { - form-element = "name"; - } - -- "www\.noc\.uz" { -- http = "true"; -- http-method = "POST"; -- http-action = "/whois.php4"; -- form-element = "dname"; -- } -- - "www\.nic\.vi" { - http = "true"; - http-method = "POST"; -@@ -885,9 +959,9 @@ server-options { - - "www\.nic\.tg" { - http = "true"; -- http-method = "GET"; -- http-action = "/moteur/info_dom.php"; -- form-element = "domaine"; -+ http-method = "POST"; -+ http-action = "/nictg/indexplus.php?pg=verifdom&op=whois"; -+ query-format = "tosearch=${+2}&typedom=.tg"; - } - - "cgi\.aub\.edu\.lb" { -@@ -917,38 +991,60 @@ server-options { - form-element = "nombre"; - } - -- "www\.denic\.de" { -- http = "true"; -- http-method = "POST"; -- http-action = "/en/whois/data.jsp"; -- form-element = "domainname"; -- form-extra = "service=WhoisData&lang=en&submit=Accept"; -- } - "whois\.denic\.de" { - whois-server = "whois.denic.de"; - query-format = "-C UTF-8 -T dn,ace $*"; - answer-charset = "UTF-8"; - } -+ - "whois\.enum\.denic\.de" { - whois-server = "whois.enum.denic.de"; - query-format = "-C UTF-8 -T dn $*"; - answer-charset = "UTF-8"; - } -+ - "whois\.nic\.ad\.jp" { - query-format = "$*/e"; - } -+ - "whois\.nic\.ch" { - answer-charset = "UTF-8"; - } -+ - "whois\.nic\.li" { - answer-charset = "UTF-8"; - } -+ - "whois\.centralnic\.*" { - whois-redirect = ".*Whois Server: \(.*\)"; - } -+ - ".*\.verisign-grs\.com" { - whois-redirect = ".*Whois Server: \(.*\)"; - } -+ -+ "whois\.sixxs\.net" { -+ whois-redirect = ".*ReferralServer: whois://\(.*\)"; -+ } -+ -+ "whois2\.afilias-grs\.net" { -+ whois-redirect = "Whois Server:\(.*\)"; -+ } -+ -+ "whois\.registrar\.telekom\.de" { -+ query-format = "full $*"; -+ } -+ -+ "whois\.rrpproxy\.net" { -+ answer-charset = "UTF-8"; -+ } -+ -+ "www\.nom\.za" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/do.php"; -+ query-format = "chkDomain=${+3}&chkAvail=Check"; -+ } - } - - # diff --git a/jwhois/patches/jwhois-4.0-conf_update2.patch b/jwhois/patches/jwhois-4.0-conf_update2.patch deleted file mode 100644 index df9ca4ebf..000000000 --- a/jwhois/patches/jwhois-4.0-conf_update2.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- jwhois-4.0/example/jwhois.conf 2009-02-27 22:20:48.000000000 +0100 -+++ jwhois-4.0/example/jwhois.conf.rsc 2009-03-08 12:33:22.000000000 +0100 -@@ -178,7 +178,7 @@ - "\.dk$" = "whois.dk-hostmaster.dk"; - "\.dm$" = "whois.nic.dm"; - "\.do$" = "whois.nic.do"; -- "\.dz$" = "whois.ripe.net"; -+ "\.dz$" = "www.nic.dz"; - "\.ec$" = "www.nic.ec"; - "\.edu$" = "whois.educause.edu"; - "\.ee$" = "whois.eenet.ee"; -@@ -268,6 +268,7 @@ - "\.nu$" = "whois.nic.nu"; - "\.nz$" = "whois.srs.net.nz"; - "\.org$" = "whois.publicinterestregistry.net"; -+ "\.pa$" = "www.nic.pa"; - "\.pe$" = "kero.yachay.pe"; - "\.pk$" = "pknic.net.pk"; - "\.pl$" = "whois.dns.pl"; -@@ -296,6 +297,7 @@ - "\.st$" = "whois.nic.st"; - "\.su$" = "whois.ripn.net"; - "\.tc$" = "whois.adamsnames.tc"; -+ "\.tel$" = "whois.nic.tel"; - "\.tf$" = "whois.afnic.fr"; - "\.tg$" = "www.nic.tg"; - "\.th$" = "whois.thnic.net"; -@@ -321,7 +323,7 @@ - "\.fed\.us$" = "whois.nic.gov"; - "\.us$" = "whois.nic.us"; - "\.com\.uy$" = "dns.antel.net.uy"; -- "\.uy$" = "www.rau.edu.uy"; # is a whois server -+ "\.uy$" = "whois.nic.org.uy"; - "\.co\.uz$" = "whois.reg.uz"; - "\.com\.uz$" = "whois.reg.uz"; - "\.uz$" = "whois.cctld.uz"; -@@ -335,7 +337,7 @@ - "\.wf$" = "whois.nic.wf"; - "\.ws$" = "whois.worldsite.ws"; - "\.yt$" = "whois.nic.yt"; -- "\.yu$" = "whois.ripe.net"; -+ "\.yu$" = "www.nic.yu"; - "\.ac\.za$" = "whois.ac.za"; - "\.org\.za$" = "rwhois.org.za 4321"; - "\.co\.za$" = "whois.co.za"; -@@ -363,6 +365,7 @@ - type = regex; - - "\.9\.4\.e164\.arpa$" = "whois.enum.denic.de"; -+ "\.1\.6\.e164\.arpa$" = "whois-check.enum.com.au"; - } - - # -@@ -741,7 +744,7 @@ - ".*-NICAT$" = "whois.nic.at"; - ".*-CZ$" = "whois.nic.cz"; - ".*-NICIR$" = "whois.nic.ir"; -- ".*-UYNIC$" = "www.rau.edu.uy"; -+ ".*-UYNIC$" = "whois.nic.org.uy"; - ".*-ITNIC$" = "whois.nic.it"; - ".*-FRNIC$" = "whois.nic.fr"; - ".*-LACNIC$" = "whois.lacnic.net"; -@@ -1045,6 +1048,27 @@ - http-action = "/do.php"; - query-format = "chkDomain=${+3}&chkAvail=Check"; - } -+ -+ "www\.nic\.pa" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/egh/whois.php"; -+ form-element = "nombre_d"; -+ } -+ -+ "www\.nic\.dz" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/index.php?option=com_content&task=view&id=37&Itemid=51"; -+ form-element = "domain_name"; -+ } -+ -+ "www\.nic\.yu" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/cgi-bin/checkavail.cgi"; -+ form-element = "domain"; -+ } - } - - # diff --git a/jwhois/patches/jwhois-4.0-conf_update3.patch b/jwhois/patches/jwhois-4.0-conf_update3.patch deleted file mode 100644 index a95466616..000000000 --- a/jwhois/patches/jwhois-4.0-conf_update3.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- jwhois-4.0/example/jwhois.conf 2009-05-03 13:15:33.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf.rsc 2009-05-03 13:17:52.000000000 +0200 -@@ -119,7 +119,7 @@ - "\.af$" = "whois.cocca.cx"; - "\.ag$" = "whois.nic.ag"; - "\.ai$" = "whois.ai"; -- "\.al$" = "whois.ripe.net"; -+ "\.al$" = "www.ert.gov.al"; - "\.am$" = "whois.amnic.net"; - "\.ar$" = "www.nic.ar"; - "\.arpa$" = "whois.iana.org"; -@@ -168,6 +168,7 @@ - query-format = "domain $*"; - } - "\.coop$" = "whois.nic.coop"; -+ "\.cu$" = "www.nic.cu"; - "\.cx$" = "whois.nic.cx"; - "\.cy$" = "whois.ripe.net"; - "\.cz$" = "whois.nic.cz"; -@@ -254,7 +255,7 @@ - "\.museum$" = "whois.museum"; - "\.mw$" = "www.tarsus.net"; - "\.mx$" = "whois.nic.mx"; -- "\.my$" = "whois.mynic.net.my"; -+ "\.my$" = "whois.domainregistry.my"; - "\.na$" = "whois.na-nic.com.na"; - "\.name$" = "whois.nic.name"; - "\.net$" { -@@ -293,6 +294,7 @@ - "\.sk$" = "whois.sk-nic.sk"; - "\.sm$" = "whois.ripe.net"; - "\.sn$" = "whois.nic.sn"; -+ "\.so$" = "whois.nic.so"; - "\.sr$" = "whois.register.sr"; - "\.st$" = "whois.nic.st"; - "\.su$" = "whois.ripn.net"; -@@ -1069,9 +1071,24 @@ - http-action = "/cgi-bin/checkavail.cgi"; - form-element = "domain"; - } -+ - "whois\.dotster\.com" { - answer-charset = "UTF-8"; - } -+ -+ "www\.ert\.gov\.al" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/ert_eng/domain_res.html"; -+ query-format = "Domain=${+2}"; -+ } -+ -+ "www\.nic\.cu" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/dom_det.php"; -+ form-element = "domsrch"; -+ } - } - - # diff --git a/jwhois/patches/jwhois-4.0-conf_update4.patch b/jwhois/patches/jwhois-4.0-conf_update4.patch deleted file mode 100644 index ffbe53da3..000000000 --- a/jwhois/patches/jwhois-4.0-conf_update4.patch +++ /dev/null @@ -1,168 +0,0 @@ ---- jwhois-4.0/example/jwhois.conf 2009-08-16 17:59:06.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf.rsc 2009-08-16 17:59:39.000000000 +0200 -@@ -121,6 +121,7 @@ - "\.ai$" = "whois.ai"; - "\.al$" = "www.ert.gov.al"; - "\.am$" = "whois.amnic.net"; -+ "\.edu\.ar$" = "www.riu.edu.ar"; - "\.ar$" = "www.nic.ar"; - "\.arpa$" = "whois.iana.org"; - "\.as$" = "whois.nic.as"; -@@ -142,8 +143,9 @@ - "\.bm$" = "rwhois.ibl.bm 4321"; - "\.bo$" = "whois.nic.bo"; - "\.br$" = "whois.nic.br"; -+ "\.bs$" = "www.register.bs"; - "\.bv$" = "whois.ripe.net"; -- "\.by$" = "whois.ripe.net"; -+ "\.by$" = "www.domain.by"; - "\.bz$" = "whois.belizenic.bz"; - "\.co\.ca$" = "whois.co.ca"; - "\.ca$" = "whois.cira.ca"; -@@ -176,7 +178,10 @@ - whois-server = "whois.denic.de"; - query-format = "-C UTF-8 -T dn,ace $*"; - } -- "\.dk$" = "whois.dk-hostmaster.dk"; -+ "\.dk$" { -+ whois-server = "whois.dk-hostmaster.dk"; -+ query-format = "--show-handles $*"; -+ } - "\.dm$" = "whois.nic.dm"; - "\.do$" = "whois.nic.do"; - "\.dz$" = "www.nic.dz"; -@@ -257,13 +262,16 @@ - "\.mx$" = "whois.nic.mx"; - "\.my$" = "whois.domainregistry.my"; - "\.na$" = "whois.na-nic.com.na"; -- "\.name$" = "whois.nic.name"; -+ "\.name$" { -+ whois-server = "whois.nic.name"; -+ query-format = "domain = $*"; -+ } - "\.net$" { - whois-server = "whois.verisign-grs.com"; - query-format = "domain $*"; - } - "\.nf$" = "whois.cocca.cx"; -- "\.ng$" = "whois.rg.net"; -+ "\.ng$" = "whois.nic.net.ng"; - "\.nl$" = "whois.domain-registry.nl"; - "\.no$" = "whois.norid.no"; - "\.nu$" = "whois.nic.nu"; -@@ -276,6 +284,7 @@ - "\.pm$" = "whois.nic.pm"; - "\.pr$" = "whois.nic.pr"; - "\.pro$" = "whois.registrypro.pro"; -+ "\.ps$" = "www.nic.ps"; - "\.pt$" = "whois.dns.pt"; - "\.pw$" = "whois.nic.pw"; - "\.re$" = "whois.nic.re"; -@@ -287,17 +296,19 @@ - "\.sb$" = "whois.nic.sb"; - "\.sc$" = "whois2.afilias-grs.net"; - "\.se$" = "whois.iis.se"; -- "\.sg$" = "whois.nic.net.sg"; -+ "\.sg$" = "whois.sgnic.sg"; - "\.sh$" = "whois.nic.sh"; - "\.si$" = "whois.arnes.si"; - "\.sj$" = "whois.ripe.net"; - "\.sk$" = "whois.sk-nic.sk"; -+ "\.sl$" = "whois.nic.sl"; - "\.sm$" = "whois.ripe.net"; - "\.sn$" = "whois.nic.sn"; - "\.so$" = "whois.nic.so"; - "\.sr$" = "whois.register.sr"; - "\.st$" = "whois.nic.st"; - "\.su$" = "whois.ripn.net"; -+ "\.sv$" = "www.svnet.org.sv"; - "\.tc$" = "whois.adamsnames.tc"; - "\.tel$" = "whois.nic.tel"; - "\.tf$" = "whois.afnic.fr"; -@@ -345,6 +356,7 @@ - "\.co\.za$" = "whois.co.za"; - "\.nom\.za$" = "www.nom.za"; - # "\.za$" = "whois.frd.ac.za"; -+ "\.co\.zw$" = "www.zispa.co.zw"; - - # - # Specify different port numbers to connect to by postfixing the IP -@@ -782,6 +794,22 @@ - whois-server = "whois.nic.coop"; - query-format = "CONTACT $*"; - } -+ ".*CONTACT-NAME$" { -+ whois-server = "whois.nic.name"; -+ query-format = "contact = $*"; -+ } -+ ".*REGISTRAR-NAME$" { -+ whois-server = "whois.nic.name"; -+ query-format = "registrar = $*"; -+ } -+ "^C[0-9]+-AERO$" { -+ whois-server = "whois.aero"; -+ query-format = "CONTACT ID $*"; -+ } -+ "^D[0-9]+-AERO$" { -+ whois-server = "whois.aero"; -+ query-format = "DOMAIN ID $*"; -+ } - } - - # -@@ -1089,6 +1117,55 @@ - http-action = "/dom_det.php"; - form-element = "domsrch"; - } -+ -+ "www\.nic\.ps" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/whois/domain_whois.php"; -+ form-element = "dname"; -+ } -+ -+ "www\.svnet\.org\.sv" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/registro/consultas/whois.php"; -+ form-element = "subdominio"; -+ } -+ -+ "www\.zispa\.co\.zw" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/cgi-bin/search"; -+ form-element = "domain"; -+ } -+ -+ "www\.riu\.edu\.ar" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/cgi-bin/verdom.pl.nuevo"; -+ query-format = "username=${+3}"; -+ } -+ -+ "www\.register\.bs" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/cgi-bin/search.pl"; -+ form-element = "name"; -+ } -+ -+ "www\.domain\.by" { -+ http = "true"; -+ http-method = "POST"; -+ http-action = "/cgi-bin/registry.cgi"; -+ query-format = "domain=${+2}&lang=e&mode=slquest"; -+ } -+ -+ "www\.nic\.ac" { -+ http = "true"; -+ http-method = "GET"; -+ http-action = "/cgi-bin/whois"; -+ form-element = "textfield"; -+ } - } - - # diff --git a/jwhois/patches/jwhois-4.0-connect.patch b/jwhois/patches/jwhois-4.0-connect.patch deleted file mode 100644 index 2a639d779..000000000 --- a/jwhois/patches/jwhois-4.0-connect.patch +++ /dev/null @@ -1,58 +0,0 @@ -This fixes somewhat reversed logic of trying to connect to WHOIS server. -Tue Nov 20 2007, Lubomir Kundrak lkundrak@redhat.com - ---- jwhois-4.0/src/utils.c.connect 2007-06-26 09:00:20.000000000 +0200 -+++ jwhois-4.0/src/utils.c 2007-11-20 17:05:33.000000000 +0100 -@@ -247,7 +247,7 @@ make_connect(const char *host, int port) - { - return -1; - } -- while (res) -+ for (; res; res = res->ai_next) - { - sa = res->ai_addr; - sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); -@@ -266,15 +266,15 @@ make_connect(const char *host, int port) - flags = fcntl(sockfd, F_GETFL, 0); - if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) == -1) - { -+ close (sockfd); - return -1; - } - -- - error = connect(sockfd, res->ai_addr, res->ai_addrlen); -- - if (error < 0 && errno != EINPROGRESS) - { -- break; -+ close (sockfd); -+ continue; - } - - FD_ZERO(&fdset); -@@ -283,18 +283,20 @@ make_connect(const char *host, int port) - error = select(FD_SETSIZE, NULL, &fdset, NULL, &timeout); - if (error == 0) - { -- break; -+ close (sockfd); -+ return -1; - } - - retlen = sizeof(retval); - error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); - if (error < 0 || retval) - { -- break; -+ close (sockfd); -+ return -1; - } -- res = res->ai_next; -+ -+ break; - } -- if (error < 0 || retval) return -1; - #endif - - return sockfd; diff --git a/jwhois/patches/jwhois-4.0-dotster.patch b/jwhois/patches/jwhois-4.0-dotster.patch deleted file mode 100644 index 0f1043553..000000000 --- a/jwhois/patches/jwhois-4.0-dotster.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf_old jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf_old 2009-04-23 16:16:41.000000000 +0200 -+++ jwhois-4.0/example/jwhois.conf 2009-04-23 16:18:15.000000000 +0200 -@@ -1069,6 +1069,9 @@ server-options { - http-action = "/cgi-bin/checkavail.cgi"; - form-element = "domain"; - } -+ "whois\.dotster\.com" { -+ answer-charset = "UTF-8"; -+ } - } - - # diff --git a/jwhois/patches/jwhois-4.0-enum.patch b/jwhois/patches/jwhois-4.0-enum.patch deleted file mode 100644 index 1abae4e54..000000000 --- a/jwhois/patches/jwhois-4.0-enum.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf.enum jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf.enum 2009-01-27 13:39:48.000000000 +0100 -+++ jwhois-4.0/example/jwhois.conf 2009-01-27 13:42:09.000000000 +0100 -@@ -17,6 +17,11 @@ whois-servers { - type = regex; - - # -+ # Catch ENUM domains -+ # -+ "\([0-9]\.\)+e164\.arpa" = "struct enum-blocks"; -+ -+ # - # You can use the special value `struct' to redirect the query - # to another block which optionally can use another type of matching. - # Here we use it to have IPv4 numbers matched using CIDR blocks instead -@@ -311,6 +316,15 @@ whois-servers { - } - - # -+# enum-blocks -+# -+enum-blocks { -+ type = regex; -+ -+ "\.9\.4\.e164\.arpa$" = "whois.enum.denic.de"; -+} -+ -+# - # cidr-blocks contains a list of all known CIDR blocks assigned to - # RIPE or APNIC. Default all queries to ARIN which has most other blocks. - # -@@ -915,6 +929,11 @@ server-options { - query-format = "-C UTF-8 -T dn,ace $*"; - answer-charset = "UTF-8"; - } -+ "whois\.enum\.denic\.de" { -+ whois-server = "whois.enum.denic.de"; -+ query-format = "-C UTF-8 -T dn $*"; -+ answer-charset = "UTF-8"; -+ } - "whois\.nic\.ad\.jp" { - query-format = "$*/e"; - } diff --git a/jwhois/patches/jwhois-4.0-fclose.patch b/jwhois/patches/jwhois-4.0-fclose.patch deleted file mode 100644 index e9c896f68..000000000 --- a/jwhois/patches/jwhois-4.0-fclose.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up jwhois-4.0/src/init.c_old jwhois-4.0/src/init.c ---- jwhois-4.0/src/init.c_old 2007-06-26 08:59:17.000000000 +0200 -+++ jwhois-4.0/src/init.c 2009-01-27 15:49:35.000000000 +0100 -@@ -283,6 +283,8 @@ parse_args(int *argc, char ***argv) - if (in) - jconfig_parse_file(in); - -+ fclose(in); -+ - if (verbose>1) - { - printf("[Debug: Cache = %s]\n", cache?"On":"Off"); diff --git a/jwhois/patches/jwhois-4.0-gi.patch b/jwhois/patches/jwhois-4.0-gi.patch deleted file mode 100644 index c5582c943..000000000 --- a/jwhois/patches/jwhois-4.0-gi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up jwhois-4.0/example/jwhois.conf_old jwhois-4.0/example/jwhois.conf ---- jwhois-4.0/example/jwhois.conf_old 2009-01-23 12:57:35.000000000 +0100 -+++ jwhois-4.0/example/jwhois.conf 2009-01-23 12:58:41.000000000 +0100 -@@ -171,7 +171,7 @@ whois-servers { - "\.fm$" = "www.dot.fm"; - "\.fo$" = "whois.ripe.net"; - "\.fr$" = "whois.nic.fr"; -- "\.gi$" = "www.nic.gi"; -+ "\.gi$" = "whois2.afilias-grs.net"; - "\.gov$" = "whois.nic.gov"; - "\.gg$" = "whois.isles.net"; - "\.gm$" = "whois.ripe.net"; diff --git a/jwhois/patches/jwhois-4.0-ipv6match.patch b/jwhois/patches/jwhois-4.0-ipv6match.patch deleted file mode 100644 index 0e5ad0e9a..000000000 --- a/jwhois/patches/jwhois-4.0-ipv6match.patch +++ /dev/null @@ -1,15 +0,0 @@ -When IPv6 address mask did not end on an octed boundary, the the opposite -part of last byte of host address was taken into account when a match was -attempted. -- Lubomir Kundrak lkundrak@redhat.com - ---- jwhois-4.0/src/lookup.c.ipv6-match 2007-12-04 17:09:57.000000000 +0100 -+++ jwhois-4.0/src/lookup.c 2007-12-04 17:10:20.000000000 +0100 -@@ -149,7 +149,7 @@ static int ipv6_address_is_in_network(co - } - /* i == bits / 8 */ - if (bits % 8 != 0 -- && (addr->s6_addr[i] & (0xFFu << (bits % 8))) != net->s6_addr[i]) -+ && (addr->s6_addr[i] & (0xFFu << 8-(bits % 8))) != net->s6_addr[i]) - return 0; - return 1; - } diff --git a/keepalived/keepalived.nm b/keepalived/keepalived.nm deleted file mode 100644 index 1220727dd..000000000 --- a/keepalived/keepalived.nm +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = keepalived -version = 1.2.7 -release = 1 - -groups = Applications/System -url = http://www.keepalived.org/ -license = GPLv2+ -summary = High Availability monitor built upon LVS, VRRP and service pollers. - -description - The main goal of the keepalived project is to add a strong & robust keepalive - facility to the Linux Virtual Server project. This project is written in C with - multilayer TCP/IP stack checks. Keepalived implements a framework based on - three family checks : Layer3, Layer4 & Layer5/7. This framework gives the - daemon the ability to check the state of an LVS server pool. When one of the - servers of the LVS server pool is down, keepalived informs the linux kernel via - a setsockopt call to remove this server entry from the LVS topology. In - addition keepalived implements an independent VRRPv2 stack to handle director - failover. So in short keepalived is a userspace daemon for LVS cluster nodes - healthchecks and LVS directors failover. -end - -source_dl = http://www.keepalived.org/software/ - -build - requires - kernel-devel - net-snmp-devel >= 5.7.2-2 - libnl-devel - openssl-devel - popt-devel - end - - configure_options += \ - --enable-snmp \ - --enable-vrrp - - make_targets += STRIP=/bin/true - - test - # A build could silently have LVS support disabled if the kernel includes can't - # be properly found, we need to avoid that. - if ! grep -q "IPVS_SUPPORT='_WITH_LVS_'" config.log; then - echo "ERROR: We do not want keeepalived lacking LVS support." - exit 1 - fi - end - - install_cmds - rm -rvf %{BUILDROOT}/etc/rc.d \ - %{BUILDROOT}/etc/keepalived/samples - end -end - -packages - package %{name} - postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - postun - /bin/systemctl --no-reload disabled keepalived.service >/dev/null 2>&1 || : - /bin/systemctl stop keepalived.service >/dev/null 2>&1 || : - end - - postup - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart keepalived.service >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/keepalived/patches/keepalived-1.2.7-dont-respawn-children.patch b/keepalived/patches/keepalived-1.2.7-dont-respawn-children.patch deleted file mode 100644 index f03df932b..000000000 --- a/keepalived/patches/keepalived-1.2.7-dont-respawn-children.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 12e58a6c40b3bfa18f0db5db9e36ed09f68d7a0c Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 29 Oct 2012 14:10:57 -0500 -Subject: [PATCH 01/10] Add option to prevent respawn of child processes. - -This patch adds a command-line option (--dont-respawn, -R) that will -prevent the child processes from respawning. When this option is -specified, if either the checker or vrrp child processes exit the -parent process will raise the SIGTERM signal and exit. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/check/check_daemon.c | 9 +++++++-- - keepalived/core/main.c | 10 +++++++++- - keepalived/vrrp/vrrp_daemon.c | 9 +++++++-- - 3 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/keepalived/check/check_daemon.c b/keepalived/check/check_daemon.c -index 1119075..68759f4 100644 ---- a/keepalived/check/check_daemon.c -+++ b/keepalived/check/check_daemon.c -@@ -227,8 +227,13 @@ check_respawn_thread(thread_t * thread) - } - - /* We catch a SIGCHLD, handle it */ -- log_message(LOG_ALERT, "Healthcheck child process(%d) died: Respawning", pid); -- start_check_child(); -+ if (!(debug & 64)) { -+ log_message(LOG_ALERT, "Healthcheck child process(%d) died: Respawning", pid); -+ start_check_child(); -+ } else { -+ log_message(LOG_ALERT, "Healthcheck child process(%d) died: Exiting", pid); -+ raise(SIGTERM); -+ } - return 0; - } - -diff --git a/keepalived/core/main.c b/keepalived/core/main.c -index 57fa134..9445a4c 100644 ---- a/keepalived/core/main.c -+++ b/keepalived/core/main.c -@@ -146,6 +146,7 @@ usage(const char *prog) - " %s --check -C Only run with Health-checker subsystem.\n" - " %s --dont-release-vrrp -V Dont remove VRRP VIPs & VROUTEs on daemon stop.\n" - " %s --dont-release-ipvs -I Dont remove IPVS topology on daemon stop.\n" -+ " %s --dont-respawn -R Dont respawn child processes.\n" - " %s --dont-fork -n Dont fork the daemon process.\n" - " %s --use-file -f Use the specified configuration file.\n" - " Default is /etc/keepalived/keepalived.conf.\n" -@@ -165,7 +166,7 @@ usage(const char *prog) - #ifdef _WITH_SNMP_ - prog, - #endif -- prog, prog, prog, prog, prog, prog, prog); -+ prog, prog, prog, prog, prog, prog, prog, prog); - } - - /* Command line parser */ -@@ -184,6 +185,7 @@ parse_cmdline(int argc, char **argv) - {"log-facility", 'S', POPT_ARG_STRING, &option_arg, 'S'}, - {"dont-release-vrrp", 'V', POPT_ARG_NONE, NULL, 'V'}, - {"dont-release-ipvs", 'I', POPT_ARG_NONE, NULL, 'I'}, -+ {"dont-respawn", 'R', POPT_ARG_NONE, NULL, 'R'}, - {"dont-fork", 'n', POPT_ARG_NONE, NULL, 'n'}, - {"dump-conf", 'd', POPT_ARG_NONE, NULL, 'd'}, - {"use-file", 'f', POPT_ARG_STRING, &option_arg, 'f'}, -@@ -232,6 +234,9 @@ parse_cmdline(int argc, char **argv) - case 'D': - debug |= 32; - break; -+ case 'R': -+ debug |= 64; -+ break; - case 'S': - log_facility = LOG_FACILITY[atoi(option_arg)].facility; - break; -@@ -282,6 +287,9 @@ parse_cmdline(int argc, char **argv) - case 'D': - debug |= 32; - break; -+ case 'R': -+ debug |= 64; -+ break; - case 'S': - log_facility = LOG_FACILITY[atoi(option_arg)].facility; - break; -diff --git a/keepalived/vrrp/vrrp_daemon.c b/keepalived/vrrp/vrrp_daemon.c -index 23ff09f..cee6c80 100644 ---- a/keepalived/vrrp/vrrp_daemon.c -+++ b/keepalived/vrrp/vrrp_daemon.c -@@ -249,8 +249,13 @@ vrrp_respawn_thread(thread_t * thread) - } - - /* We catch a SIGCHLD, handle it */ -- log_message(LOG_ALERT, "VRRP child process(%d) died: Respawning", pid); -- start_vrrp_child(); -+ if (!(debug & 64)) { -+ log_message(LOG_ALERT, "VRRP child process(%d) died: Respawning", pid); -+ start_vrrp_child(); -+ } else { -+ log_message(LOG_ALERT, "VRRP child process(%d) died: Exiting", pid); -+ raise(SIGTERM); -+ } - return 0; - } - --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-fix-error-message.patch b/keepalived/patches/keepalived-1.2.7-fix-error-message.patch deleted file mode 100644 index b6f19beef..000000000 --- a/keepalived/patches/keepalived-1.2.7-fix-error-message.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c04dfcae58d6449980e38ed5a555d1a86f363f71 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 19 Nov 2012 10:09:11 -0600 -Subject: [PATCH 07/10] Fix typo in error messages. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/vrrp/vrrp_ipaddress.c | 2 +- - keepalived/vrrp/vrrp_iproute.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keepalived/vrrp/vrrp_ipaddress.c b/keepalived/vrrp/vrrp_ipaddress.c -index c003b1a..51cd488 100644 ---- a/keepalived/vrrp/vrrp_ipaddress.c -+++ b/keepalived/vrrp/vrrp_ipaddress.c -@@ -165,7 +165,7 @@ alloc_ipaddress(list ip_list, vector_t *strvec, interface *ifp) - ifp_local = if_get_by_ifname(vector_slot(strvec, ++i)); - if (!ifp_local) { - log_message(LOG_INFO, "VRRP is trying to assign VIP to unknown %s" -- " interface !!! go out and fixe your conf !!!", -+ " interface !!! go out and fix your conf !!!", - (char *)vector_slot(strvec, i)); - FREE(new); - return; -diff --git a/keepalived/vrrp/vrrp_iproute.c b/keepalived/vrrp/vrrp_iproute.c -index a8feec4..464259c 100644 ---- a/keepalived/vrrp/vrrp_iproute.c -+++ b/keepalived/vrrp/vrrp_iproute.c -@@ -203,7 +203,7 @@ alloc_route(list rt_list, vector_t *strvec) - ifp = if_get_by_ifname(vector_slot(strvec, ++i)); - if (!ifp) { - log_message(LOG_INFO, "VRRP is trying to assign VROUTE to unknown " -- "%s interface !!! go out and fixe your conf !!!", -+ "%s interface !!! go out and fix your conf !!!", - (char *)vector_slot(strvec, i)); - FREE(new); - return; --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-fix-pointer-arithmetic-vrrp-packet.patch b/keepalived/patches/keepalived-1.2.7-fix-pointer-arithmetic-vrrp-packet.patch deleted file mode 100644 index c4f942e1a..000000000 --- a/keepalived/patches/keepalived-1.2.7-fix-pointer-arithmetic-vrrp-packet.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f9264a16d6a651a15731ba43d917f0b311257d47 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Fri, 16 Nov 2012 14:54:37 -0600 -Subject: [PATCH 05/10] Fix pointer arithmetic for VRRP packet - -When using IPSEC AH authentication, the pointer arithmetic used to get -the location of the VRRP packet is incorrect. The address of the IPSEC -header must be cast as (char *) in order to get correct address of the -VRRP packet. Without this patch, vrrp_in_chk() will fail to verify -incoming VRRP packets when IPSEC AH is enabled. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/vrrp/vrrp.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c -index 1248fb8..0a8bc3f 100644 ---- a/keepalived/vrrp/vrrp.c -+++ b/keepalived/vrrp/vrrp.c -@@ -238,7 +238,7 @@ vrrp_in_chk(vrrp_rt * vrrp, char *buffer) - - if (vrrp->auth_type == VRRP_AUTH_AH) { - ah = (ipsec_ah *) (buffer + ihl); -- hd = (vrrp_pkt *) (ah + vrrp_ipsecah_len()); -+ hd = (vrrp_pkt *) ((char *) ah + vrrp_ipsecah_len()); - } else { - hd = (vrrp_pkt *) (buffer + ihl); - } --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-fix-primary-ip-address-comparison.patch b/keepalived/patches/keepalived-1.2.7-fix-primary-ip-address-comparison.patch deleted file mode 100644 index f2743ec9f..000000000 --- a/keepalived/patches/keepalived-1.2.7-fix-primary-ip-address-comparison.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6e52cb884e3cab75ca5597b59027a11d982593ab Mon Sep 17 00:00:00 2001 -From: Boon Ang boon.s.ang@gmail.com -Date: Thu, 6 Dec 2012 11:01:55 -0600 -Subject: [PATCH 09/10] Fix comparison of primary IP addresses. - -If a router in the master state receives an advertisement with -priority equal to the local priority, it must also compare the primary -IP addresses (RFC 3768, section 6.4.3). The code to handle this was -comparing two IP addresses with different byte-ordering, resulting in -multiple routers in the master state. This patches resolves the -problem by coverting the local primary IP address to network byte -order for the comparison. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/vrrp/vrrp.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c -index 0a8bc3f..a88deb3 100644 ---- a/keepalived/vrrp/vrrp.c -+++ b/keepalived/vrrp/vrrp.c -@@ -923,7 +923,7 @@ vrrp_state_master_rx(vrrp_rt * vrrp, char *buf, int buflen) - } else if (vrrp->family == AF_INET) { - if (hd->priority > vrrp->effective_priority || - (hd->priority == vrrp->effective_priority && -- ntohl(saddr) > VRRP_PKT_SADDR(vrrp))) { -+ ntohl(saddr) > ntohl(VRRP_PKT_SADDR(vrrp)))) { - log_message(LOG_INFO, "VRRP_Instance(%s) Received higher prio advert" - , vrrp->iname); - if (proto == IPPROTO_IPSEC_AH) { --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-fix-ssl-certificate-load.patch b/keepalived/patches/keepalived-1.2.7-fix-ssl-certificate-load.patch deleted file mode 100644 index 8251d8931..000000000 --- a/keepalived/patches/keepalived-1.2.7-fix-ssl-certificate-load.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3cc70656961f0384b1db030e0697a00af0b30e65 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 19 Nov 2012 09:51:50 -0600 -Subject: [PATCH 06/10] Load SSL certificate correctly. - -This patch fixes a problem where keepalived will attempt to load an -SSL keyfile as a certificate, resulting in failure to initialize SSL -context. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/check/check_ssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c -index 618d9a4..574ba30 100644 ---- a/keepalived/check/check_ssl.c -+++ b/keepalived/check/check_ssl.c -@@ -86,10 +86,10 @@ build_ssl_ctx(void) - } - - /* Load our keys and certificates */ -- if (check_data->ssl->keyfile) -+ if (check_data->ssl->certfile) - if (! - (SSL_CTX_use_certificate_chain_file -- (ssl->ctx, check_data->ssl->keyfile))) { -+ (ssl->ctx, check_data->ssl->certfile))) { - log_message(LOG_INFO, - "SSL error : Cant load certificate file..."); - return 0; --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-remove-debug-messages.patch b/keepalived/patches/keepalived-1.2.7-remove-debug-messages.patch deleted file mode 100644 index 87cc85a45..000000000 --- a/keepalived/patches/keepalived-1.2.7-remove-debug-messages.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fd8665b424457accfa37703d4c9456be22ab8b53 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 10 Dec 2012 13:25:01 -0600 -Subject: [PATCH 10/10] Remove log_message calls from if_get_by_ifname. - -The if_get_by_ifname function would log a message if either the -if_queue list was empty or if the interface name was not present in -the list. Since if_get_by_ifname is called to check for the existence -of an interface before adding it to the list, the "No such interface" -message is logged whenever adding a new interface to this list. This -is normal but can be confusing. Since if_get_by_ifname returns NULL -when the interface does not exist, the caller should be responsible -for logging any error messages. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - keepalived/vrrp/vrrp_if.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/keepalived/vrrp/vrrp_if.c b/keepalived/vrrp/vrrp_if.c -index df38d9d..6d5735e 100644 ---- a/keepalived/vrrp/vrrp_if.c -+++ b/keepalived/vrrp/vrrp_if.c -@@ -85,18 +85,14 @@ if_get_by_ifname(const char *ifname) - interface *ifp; - element e; - -- if (LIST_ISEMPTY(if_queue)) { -- log_message(LOG_ERR, "Interface queue is empty"); -+ if (LIST_ISEMPTY(if_queue)) - return NULL; -- } - - for (e = LIST_HEAD(if_queue); e; ELEMENT_NEXT(e)) { - ifp = ELEMENT_DATA(e); - if (!strcmp(ifp->ifname, ifname)) - return ifp; - } -- -- log_message(LOG_ERR, "No such interface, %s", ifname); - return NULL; - } - --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-update-gpl-license.patch b/keepalived/patches/keepalived-1.2.7-update-gpl-license.patch deleted file mode 100644 index a4eae911c..000000000 --- a/keepalived/patches/keepalived-1.2.7-update-gpl-license.patch +++ /dev/null @@ -1,146 +0,0 @@ -From a6630f9e2e9d05261a5a6b880c5d452bc49e9808 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 19 Nov 2012 10:28:40 -0600 -Subject: [PATCH 08/10] Update GPLv2 license. - -This GPLv2 license found in COPYING had a couple errors, including an -incorrect address for the Free Software Foundation. This patch updates -the GPLv2 license to match the license that can be found at: -http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - COPYING | 42 +++++++++++++++++++++--------------------- - 1 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/COPYING b/COPYING -index a43ea21..d159169 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 675 Mass Ave, Cambridge, MA 02139, USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- Appendix: How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least - the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> -- Copyright (C) 19yy <name of author> -+ Copyright (C) <year> <name of author> - - 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 -@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. - 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, write to the Free Software -- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) 19yy name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names: - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. --- -1.7.1 - diff --git a/keepalived/patches/keepalived-1.2.7-update-keepalived-man-page.patch b/keepalived/patches/keepalived-1.2.7-update-keepalived-man-page.patch deleted file mode 100644 index a69e07861..000000000 --- a/keepalived/patches/keepalived-1.2.7-update-keepalived-man-page.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 3a0a8643450bf9be6920ae857c03377102fdfd40 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara rohara@redhat.com -Date: Mon, 5 Nov 2012 11:28:21 -0600 -Subject: [PATCH 04/10] Update keepalived man page - -The keepalived(8) was out-of-date and, in some cases, inaccurate. This -patch provides a complete rewrite of the keepalived(8) man page. This -includes updated synopsis, description, and options. - -Signed-off-by: Ryan O'Hara rohara@redhat.com ---- - doc/man/man8/keepalived.8 | 179 ++++++++++++++++++++++++++------------------- - 1 files changed, 104 insertions(+), 75 deletions(-) - -diff --git a/doc/man/man8/keepalived.8 b/doc/man/man8/keepalived.8 -index 861045a..94c366a 100644 ---- a/doc/man/man8/keepalived.8 -+++ b/doc/man/man8/keepalived.8 -@@ -1,75 +1,104 @@ --." --." keepalived(8) --." --." Copyright (C) 2004 Joseph Mack --.TH keepalived 8 "Jan 2004" --.SH NAME --keepalived. - keepalive demon --.SH SYNOPSIS --.B "/usr/sbin/keepalived [-n] [-f keepalived.conf] [-d] [-h] [-v]" --.SH DESCRIPTION --The --.B keepalived --The keepalived server implements the vrrpd routing demon --which enables routing failover for a pair (or set) of routers --(or LVS directors) --and the keepalived demon which sets up and does the health checking --of virtual services in a Linux Virtual Servier. --.SH OPTIONS --.TP --.B --vrrp, -P --Only run the VRRP subsystem. --.TP --.B --check, -C --Only run the healthchecker subsystem. --.TP --.B --dont-release-vrrp, -V --leave (don't remove) VRRP VIPs & VROUTEs on daemon stop. --.TP ----dont-release-ipvs, -I --Dont remove IPVS topology on daemon stop. --.TP ----dont-fork, -n --Dont fork the daemon process. --.TP ----use-file, -f keepalived.conf_file --Use the specified configuration file. --.TP ----wdog-vrrp, -R --Define VRRP watchdog polling delay (default=5s) --.TP ----wdog-check, -H --Define healthchecker's watchdog polling delay (default=5s) --.TP ----dump-conf, -d --Dump the configuration data. --.TP ----log-console, -l --Log messages to local console. --.TP ----log-detail, -D --Detailed log messages (the default with the rc script provided). --.TP ----log-facility, -S --0-7 Set syslog facility to LOG_LOCAL[0-7] (default=LOG_DAEMON) --.TP ----snmp, -x --Enable SNMP support --.TP ----help, -h --Display a short inlined help screen. --.TP ----version, -v --Display the version number. -- --.SH FILES --.BR /etc/keepalived/keepalived.conf --.SH SEE ALSO --.BR keepalived.conf(5) --.SH AUTHORS --.br --Joseph Mack --.br --from inspection of the output of --.I keepalived --help --from keepalived-1.1.4 -+.TH KEEPALIVED "8" "November 2012" -+ -+.na -+.nh -+ -+.SH "NAME" -+keepalived - load-balancing and high-availability service -+ -+.SH "SYNOPSIS" -+\fBkeepalived\fP -+[\fB-f\fP|\fB--use-file\fP=FILE] -+[\fB-P\fP|\fB--vrrp\fP] -+[\fB-C\fP|\fB--check\fP] -+[\fB-l\fP|\fB--log-console\fP] -+[\fB-D\fP|\fB--log-detail\fP] -+[\fB-S\fP|\fB--log-facility\fP={0-7}] -+[\fB-V\fP|\fB--dont-release-vrrp\fP] -+[\fB-I\fP|\fB--dont-release-ipvs\fP] -+[\fB-R\fP|\fB--dont-respawn\fP] -+[\fB-n\fP|\fB--dont-fork\fP] -+[\fB-d\fP|\fB--dump-conf\fP] -+[\fB-p\fP|\fB--pid\fP=FILE] -+[\fB-r\fP|\fB--vrrp_pid\fP=FILE] -+[\fB-c\fP|\fB--checkers_pid\fP=FILE] -+[\fB-v\fP|\fB--version\fP] -+[\fB-h\fP|\fB--help\fP] -+ -+.SH "DESCRIPTION" -+Keepalived provides simple and robust facilities for load-balancing -+and high-availability. The load-balancing framework relies on -+well-known and widely used Linux Virtual Server (IPVS) kernel module -+providing Layer4 load-balancing. Keepalived implements a set of -+checkers to dynamically and adaptively maintain and manage -+load-balanced server pool according their health. Keepalived also -+implements the VRRPv2 protocol to achieve high-availability with -+director failover. -+ -+.SH "OPTIONS" -+.TP -+\fB -f, --use-file\fP=FILE -+Use the specified configuration file. The default configuration file -+is "/etc/keepalived/keepalived.conf". -+.TP -+\fB -P, --vrrp\fP -+Only run the VRRP subsystem. This is useful for configurations that do -+not use IPVS load balancer. -+.TP -+\fB -C, --check\fP -+Only run the healthcheck subsystem. This is useful for configurations -+that use the IPVS load balancer with a single director with no failover. -+.TP -+\fB -l, --log-console\fP -+Log messages to the local console. The default behavior is to log -+messages to syslog. -+.TP -+\fB -D, --log-detail\fP -+Detailed log messages. -+.TP -+\fB -S, --log-facility\fP=[0-7] -+Set syslog facility to LOG_LOCAL[0-7]. The default syslog facility is LOG_DAEMON. -+.TP -+\fB -V, --dont-release-vrrp\fP -+Don't remove VRRP VIPs and VROUTEs on daemon stop. The default -+behavior is to remove all VIPs and VROUTEs when keepalived exits -+.TP -+\fB -I, --dont-release-ipvs\fP -+Don't remove IPVS topology on daemon stop. The default behavior it to -+remove all entries from the IPVS virtual server table on when -+keepalived exits. -+.TP -+\fB -R, --dont-respawn\fP -+Don't respawn child processes. The default behavior is to restart the -+VRRP and checker processes if either process exits. -+.TP -+\fB -n, --dont-fork\fP -+Don't fork the daemon process. This option will cause keepalived to -+run in the foreground. -+.TP -+\fB -d, --dump-conf\fP -+Dump the configuration data. -+.TP -+\fB -p, --pid\fP=FILE -+Use specified pidfile for parent keepalived process. The default -+pidfile for keepalived is "/var/run/keepalived.pid". -+.TP -+\fB -r, --vrrp_pid\fP=FILE -+Use specified pidfile for VRRP child process. The default pidfile for -+the VRRP child process is "/var/run/keepalived_vrrp.pid". -+.TP -+\fB -c, --checkers_pid\fP=FILE -+Use specified pidfile for checkers child process. The default pidfile -+for the checker child process is "/var/run/keepalived_checkers.pid". -+.TP -+\fB -v, --version\fP -+Display the version and exit. -+.TP -+\fB -h, --help\fP -+Display this help message and exit. -+ -+.SH "SEE ALSO" -+\fBkeepalived.conf\fP(5), \fBipvsadm\fP(8) -+ -+.SH "AUTHOR" -+This man page was written by Ryan O'Hara rohara@redhat.com --- -1.7.1 - diff --git a/keepalived/systemd/keepalived.service b/keepalived/systemd/keepalived.service deleted file mode 100644 index 0ab6efe6e..000000000 --- a/keepalived/systemd/keepalived.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=LVS and VRRP High Availability Monitor -After=syslog.target network.target - -[Service] -Type=forking -KillMode=process -ExecStart=/usr/sbin/keepalived -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/keyutils/keyutils.nm b/keyutils/keyutils.nm new file mode 100644 index 000000000..2fec320d1 --- /dev/null +++ b/keyutils/keyutils.nm @@ -0,0 +1,76 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = keyutils +version = 1.6.1 +release = 1 + +groups = System/Tools +url = http://people.redhat.com/~dhowells/keyutils/ +license = GPLv2+ and LGPLv2+ +summary = Linux Key Management Utilities + +description + Utilities to control the kernel key management facility and to provide + a mechanism by which the kernel call back to user space to get a key + instantiated. +end + +source_dl = http://people.redhat.com/~dhowells/keyutils/ +sources = %{thisapp}.tar.bz2 + +build + requires + kernel-headers + end + + make_build_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} \ + NO_GLIBC_KEYERR=1 \ + CFLAGS="-Wall %{CFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + + make_install_targets += \ + NO_ARLIB=1 \ + ETCDIR=%{sysconfdir} \ + LIBDIR=%{libdir} \ + USRLIBDIR=%{libdir} \ + BINDIR=%{bindir} \ + SBINDIR=%{sbindir} \ + MANDIR=%{mandir} \ + INCLUDEDIR=%{includedir} \ + SHAREDIR=%{datadir}/%{name} + + install_cmds + # Fix broken symlink. + ln -svf libkeyutils.so.1 %{BUILDROOT}%{libdir}/libkeyutils.so + end +end + +packages + package %{name} + + package libkeyutils + template LIBS + end + + package libkeyutils-devel + template DEVEL + + requires += libkeyutils = %{thisver} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libgssglue/libgssglue.nm b/libgssglue/libgssglue.nm deleted file mode 100644 index 97691ec4a..000000000 --- a/libgssglue/libgssglue.nm +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libgssglue -version = 0.4 -release = 1 - -groups = Development/Tools -url = http://www.citi.umich.edu/projects/nfsv4/linux/ -license = BSD -summary = This library exports a gssapi interface. - -description - This library exports a gssapi interface, but doesn't implement any - gssapi mechanisms itself; instead it calls gssapi routines in other - libraries, depending on the mechanism. -end - -source_dl = http://www.citi.umich.edu/projects/nfsv4/linux/%%7Bname%7D/ - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libnfsidmap/libnfsidmap.nm b/libnfsidmap/libnfsidmap.nm deleted file mode 100644 index 7cd1bd102..000000000 --- a/libnfsidmap/libnfsidmap.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libnfsidmap -version = 0.25 -release = 2 - -groups = System/Libraries -url = http://www.citi.umich.edu/projects/nfsv4/linux/ -license = BSD -summary = Library to help mapping id's, mainly for NFSv4. - -description - libnfsidmap provides functions to map between NFSv4 names - (which are of the form user@domain) and local uid's and gid's. -end - -source_dl = http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ - -build - requires - autoconf - automake - gcc-c++ - openldap-devel - end - - configure_options += \ - --with-pluginpath=%{libdir}/%{name} \ - --disable-static - - prepare_cmds - ./autogen.sh - end - - install_cmds - mkdir -pv %{BUILDROOT}%{sysconfdir} - install -m 644 idmapd.conf %{BUILDROOT}%{sysconfdir} - end -end - -packages - package %{name} - configfiles - %{sysconfdir}/idmapd.conf - end - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch b/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch deleted file mode 100644 index e01e3f441..000000000 --- a/libnfsidmap/patches/libnfsidmap-0.26-rc1.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit ee3099dbc71c6190cc612e923506c7d634b4b3c9 -Author: Ville Skyttä ville.skytta@iki.fi -Date: Tue Jun 19 10:10:40 2012 -0400 - - idmapd.conf.5: Fixed some syntax typos - - Signed-off-by: Steve Dickson steved@redhat.com - -diff --git a/idmapd.conf.5 b/idmapd.conf.5 -index 9c7f1ae..7b9e762 100644 ---- a/idmapd.conf.5 -+++ b/idmapd.conf.5 -@@ -234,7 +234,6 @@ Number of seconds before timing out an LDAP request - ." ------------------------------------------------------------------- - ." - .SH EXAMPLES --." - An example - .I /etc/idmapd.conf - file: -@@ -266,7 +265,7 @@ johndoe@OTHER.DOMAIN.ORG = johnny - LDAP_server = ldap.domain.org - LDAP_base = dc=org,dc=domain - --.fo -+.fi - ." - ." ------------------------------------------------------------------- - ." Additional sections -@@ -275,11 +274,11 @@ LDAP_base = dc=org,dc=domain - .SH SEE ALSO - .BR idmapd (8) - .BR svcgssd (8) --.".SH COMPATIBILITY --.".SH STANDARDS --.".SH ACKNOWLEDGEMENTS --.".SH AUTHORS --.".SH HISTORY -+.".SH COMPATIBILITY -+.".SH STANDARDS -+.".SH ACKNOWLEDGEMENTS -+.".SH AUTHORS -+.".SH HISTORY - .SH BUGS - Report bugs to nfsv4@linux-nfs.org --.".SH CAVEATS -+.".SH CAVEATS - -commit f079113f90366f1965b9fd3b0fdbce77415f37a7 -Author: Juno Krahn Juno.Krahn@gmail.com -Date: Mon Mar 19 08:33:58 2012 -0400 - - idmapd: logging of Local-Realms only lists the last realm - - The list of local realms can be logged with a massage like the following: - rpc.idmapd: libnfsidmap: Realms list: 'EXAMPLE2.COM' - Instead of printing a list of realms, only the last realm in the list is shown. - - https://bugzilla.redhat.com/show_bug.cgi?id=804152 - - Signed-off-by: Steve Dickson steved@redhat.com - -diff --git a/libnfsidmap.c b/libnfsidmap.c -index 57bb6c3..641d766 100644 ---- a/libnfsidmap.c -+++ b/libnfsidmap.c -@@ -285,8 +285,9 @@ int nfs4_init_name_mapping(char *conffile) - } - buf = malloc(siz); - if (buf) { -+ *buf = 0; - TAILQ_FOREACH(r, &local_realms->fields, link) { -- sprintf(buf, "'%s' ", r->field); -+ sprintf(buf+strlen(buf), "'%s' ", r->field); - } - IDMAP_LOG(1, ("libnfsidmap: Realms list: %s", buf)); - free(buf); diff --git a/librpcsecgss/librpcsecgss.nm b/librpcsecgss/librpcsecgss.nm deleted file mode 100644 index d7d8e3d07..000000000 --- a/librpcsecgss/librpcsecgss.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = librpcsecgss -version = 0.19 -release = 1 - -groups = System/Libraries -url = http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ -license = BSD -summary = A Library for secure rpc communication. - -description - rpcsecgss allows secure rpc communication using the rpcsec_gss \ - protocol. -end - -source_dl = http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ -sources = %{thisapp}.tar.gz - -build - requires - libgssglue-devel - pkg-config - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libtirpc/libtirpc.nm b/libtirpc/libtirpc.nm index b37755962..418960cd8 100644 --- a/libtirpc/libtirpc.nm +++ b/libtirpc/libtirpc.nm @@ -5,7 +5,7 @@
name = libtirpc version = 1.3.3 -release = 1 +release = 3
groups = System/Libraries url = http://nfsv4.bullopensource.org/ @@ -26,8 +26,8 @@ build requires autoconf automake - libgssglue-devel libtool + krb5-devel end
prepare_cmds @@ -35,9 +35,6 @@ build autoreconf -fisv end
- configure_options += \ - --disable-gssapi - install_cmds # Fix installation path of the man pages. mv %{BUILDROOT}%{mandir}/man3{,t} diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index 07ac64ce1..f68819792 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -4,8 +4,8 @@ ###############################################################################
name = nfs-utils -version = 1.3.3 -release = 1 +version = 2.6.2 +release = 3
groups = Networking/Tools url = http://nfs.sourceforge.net/ @@ -35,14 +35,14 @@ build libdevmapper-devel libcap-devel libevent-devel - libgssglue-devel >= 0.3 + libkeyutils-devel libmount-devel - libnfsidmap-devel - libtirpc-devel + libtirpc-devel >= 1.3.3-3 libtool + rpcsvc-proto shadow-utils sqlite-devel - systemd-units + systemd-devel end
configure_options += \ @@ -50,9 +50,16 @@ build --enable-libmount-mount \ --enable-mountconfig \ --enable-ipv6 \ - --with-statdpath=/var/lib/nfs/statd + --enable-gss \ + --with-statedir=/var/lib/nfs \ + --with-statdpath=/var/lib/nfs/statd \ + --with-start-statd=/usr/bin/start-statd \ + --with-systemd
prepare_cmds + # Install utils into correct place. + sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am + sh autogen.sh
%{create_user} @@ -96,7 +103,6 @@ packages end
requires - libnfsidmap >= 0.25 quota rpcbind util-linux @@ -126,6 +132,14 @@ packages end end
+ package libnfsidmap + template LIBS + end + + package libnfsidmap-devel + template DEVEL + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/nfs-utils/systemd/nfs-blkmap.service b/nfs-utils/systemd/nfs-blkmap.service deleted file mode 100644 index 6b5127ba5..000000000 --- a/nfs-utils/systemd/nfs-blkmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=pNFS block layout mapping daemon -Wants=var-lib-nfs-rpc_pipefs.mount -Requires=var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/blkmapd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-idmap.service b/nfs-utils/systemd/nfs-idmap.service deleted file mode 100644 index e0c18037d..000000000 --- a/nfs-utils/systemd/nfs-idmap.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFSv4 ID-name mapping daemon -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.idmapd - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-lock.service b/nfs-utils/systemd/nfs-lock.service deleted file mode 100644 index fa991e5c1..000000000 --- a/nfs-utils/systemd/nfs-lock.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=NFS file locking service. -Requires=rpcbind.service network.target -After=network.target named.service rpcbind.service -Before=remote-fs-pre.target - -[Service] -Type=forking -StandardError=syslog+console -ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig -ExecStart=/sbin/rpc.statd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-mountd.service b/nfs-utils/systemd/nfs-mountd.service deleted file mode 100644 index 32e1638c7..000000000 --- a/nfs-utils/systemd/nfs-mountd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Mount Daemon -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -ExecStart=/usr/sbin/rpc.mountd -StandardError=syslog+console - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-rquotad.service b/nfs-utils/systemd/nfs-rquotad.service deleted file mode 100644 index ab1d2078e..000000000 --- a/nfs-utils/systemd/nfs-rquotad.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Remote Quota Server -BindTo=nfs-server.service -After=nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=-/usr/sbin/rpc.rquotad - -[Install] -WantedBy=nfs.target diff --git a/nfs-utils/systemd/nfs-secure-server.service b/nfs-utils/systemd/nfs-secure-server.service deleted file mode 100644 index b88bab55c..000000000 --- a/nfs-utils/systemd/nfs-secure-server.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Secure NFS Server -Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service -After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.svcgssd - -[Install] -WantedBy=multi-user.target - diff --git a/nfs-utils/systemd/nfs-secure.service b/nfs-utils/systemd/nfs-secure.service deleted file mode 100644 index 2a7dfb678..000000000 --- a/nfs-utils/systemd/nfs-secure.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Secure NFS -Requires=var-lib-nfs-rpc_pipefs.mount -After=syslog.target var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -StandardError=syslog+console -ExecStart=/usr/sbin/rpc.gssd - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/nfs-server.service b/nfs-utils/systemd/nfs-server.service deleted file mode 100644 index 79d114e0d..000000000 --- a/nfs-utils/systemd/nfs-server.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=NFS Server -Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service -Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service -After=network.target named.service - -[Service] -Type=oneshot -RemainAfterExit=yes -StandardError=syslog+console -ExecStartPre=/usr/sbin/exportfs -r -ExecStart=/usr/sbin/rpc.nfsd -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -f - -[Install] -WantedBy=multi-user.target - diff --git a/nfs-utils/systemd/nfs.target b/nfs-utils/systemd/nfs.target deleted file mode 100644 index 6c3262a76..000000000 --- a/nfs-utils/systemd/nfs.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Network File System Server -Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service -After=network.target named.service - -[Install] -WantedBy=multi-user.target diff --git a/nfs-utils/systemd/proc-fs-nfsd.mount b/nfs-utils/systemd/proc-fs-nfsd.mount deleted file mode 100644 index e5ee6fbf6..000000000 --- a/nfs-utils/systemd/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=nfsd diff --git a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount b/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index d27e1a26a..000000000 --- a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs diff --git a/perl-common-sense/perl-common-sense.nm b/perl-common-sense/perl-common-sense.nm index 54ed9bc3f..5d1f3488c 100644 --- a/perl-common-sense/perl-common-sense.nm +++ b/perl-common-sense/perl-common-sense.nm @@ -4,8 +4,8 @@ ###############################################################################
name = perl-common-sense -version = 3.73 -release = 1.1 +version = 3.75 +release = 1 arch = noarch thisapp = common-sense-%{version}
@@ -24,7 +24,7 @@ description - no warnings; end
-source_dl = http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/ +source_dl = https://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/
build requires @@ -48,8 +48,6 @@ end
packages package %{name} - requires - perl(:MODULE_COMPAT_%{perl_version}) - end + requires = perl(:MODULE_COMPAT_%{perl_version}) end end diff --git a/whois/whois.nm b/whois/whois.nm new file mode 100644 index 000000000..a96855c1b --- /dev/null +++ b/whois/whois.nm @@ -0,0 +1,60 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = whois +version = 5.5.15 +release = 1 + +groups = Applications/Internet +url = https://github.com/rfc1036/whois +license = GPLv2 +summary = Intelligent WHOIS client. + +description + whois searches for an object in a RFC 3912 database. + + This version of the whois client tries to guess the right server to + ask for the specified object. If no guess can be made it will connect to + whois.networksolutions.com +end + +source_dl = http://ftp.debian.org/debian/pool/main/w/whois/ +sources = %{name}_%{version}.tar.xz + +build + DIR_APP = %{DIR_SRC}/%{name} + + requires + libidn2-devel + perl + perl(autodie) + perl(strict) + perl(warnings) + end + + build + make \ + CONFIG_FILE="%{sysconfdir}/%{name}.conf" \ + HAVE_ICONV=1 \ + CFLAGS="%{CFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + end + + # Only install the whois tool. + make_install_targets = install-whois + + install_cmds + # Install config file. + install -p -m644 -D %{name}.conf %{BUILDROOT}%{sysconfdir}/%{name}.conf + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer