From 44d4c3013e2464d65d09d4177c10d32aad087ad3 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Fri, 19 Dec 2003 15:23:28 +0000 Subject: [PATCH] Alejandro Mery : lvs->ipvsadm-1.21 keepalived-1.1.3 git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2010 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/mnemoc/keepalived/keepalived.desc | 6 +-- package/mnemoc/lvs/kernel.conf.sh | 25 --------- package/mnemoc/lvs/lvs.conf | 3 -- package/mnemoc/lvs/lvs.desc | 8 +-- .../mnemoc/lvs/pkg_linux24-header_pre.conf | 23 -------- package/mnemoc/lvs/pkg_linux24-src_pre.conf | 23 -------- package/mnemoc/lvs/pkg_linux24_pre.conf | 52 ------------------- 8 files changed, 9 insertions(+), 132 deletions(-) delete mode 100644 package/mnemoc/lvs/kernel.conf.sh delete mode 100644 package/mnemoc/lvs/pkg_linux24-header_pre.conf delete mode 100644 package/mnemoc/lvs/pkg_linux24-src_pre.conf delete mode 100644 package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 7e069475e..aa4fb71c5 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -8,6 +8,7 @@ - Stefan Fiedler: some more mkdir -p to remove enable directory notifications for KDE - cleanup of tcp_wrappers.conf + - Alejandro Mery: updated lvs->ipvsadm, keepalived *) 2003-12-17 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/mnemoc/keepalived/keepalived.desc b/package/mnemoc/keepalived/keepalived.desc index 497a627f5..417815b24 100644 --- a/package/mnemoc/keepalived/keepalived.desc +++ b/package/mnemoc/keepalived/keepalived.desc @@ -21,7 +21,7 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[I] Keepalive facility for LVS project +[I] Keepalive facility for the IPVS kernel module [T] The main goal of the keepalived project is to add a strong & robust [T] keepalive facility to the Linux Virtual Server project. @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.1.2 +[V] 1.1.3 [P] X -----5---9 790.000 -[D] 3583696146 keepalived-1.1.2.tar.gz http://keepalived.sourceforge.net/software/ +[D] 683063987 keepalived-1.1.3.tar.gz http://keepalived.sourceforge.net/software/ diff --git a/package/mnemoc/lvs/kernel.conf.sh b/package/mnemoc/lvs/kernel.conf.sh deleted file mode 100644 index 1806adba8..000000000 --- a/package/mnemoc/lvs/kernel.conf.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/lvs/kernel.conf.sh -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -echo CONFIG_NETFILTER=y >> $1 -echo CONFIG_IP_VS=y >> $1 diff --git a/package/mnemoc/lvs/lvs.conf b/package/mnemoc/lvs/lvs.conf index 520caf30b..b807ab94d 100644 --- a/package/mnemoc/lvs/lvs.conf +++ b/package/mnemoc/lvs/lvs.conf @@ -20,7 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -srcdir="ipvs-$ver/ipvs/ipvsadm" var_append makeinstopt ' ' "SBIN=$sbindir" - -hook_add premake 3 "cp -vf ../ip_vs.h $root/$prefix/include/net/ip_vs.h" diff --git a/package/mnemoc/lvs/lvs.desc b/package/mnemoc/lvs/lvs.desc index 47ffc0e69..9b7994d16 100644 --- a/package/mnemoc/lvs/lvs.desc +++ b/package/mnemoc/lvs/lvs.desc @@ -21,13 +21,15 @@ [COPY] [COPY] --- ROCK-COPYRIGHT-NOTE-END --- -[I] The Linux Virtual Server +[I] An utility to administer the IPVS kernel module [T] The Linux Virtual Server is a highly scalable and highly available [T] server built on a cluster of real servers, with the load balancer [T] running on the Linux operating system. The architecture of the [T] cluster is transparent to end users. End users only see a single [T] virtual server. +[T] +[T] IPVS (lvs) was included into the official Linux kernel 2.4.23 [U] http://www.linuxvirtualserver.org/ @@ -38,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.0.10 +[V] 1.21 [P] O -----5---9 789.000 -[D] 3925226949 ipvs-1.0.10.tar.gz http://www.linuxvirtualserver.org/software/kernel-2.4/ +[D] 2519496157 ipvsadm-1.21.tar.gz http://www.linux-vs.org/software/kernel-2.4/ diff --git a/package/mnemoc/lvs/pkg_linux24-header_pre.conf b/package/mnemoc/lvs/pkg_linux24-header_pre.conf deleted file mode 100644 index 9df1af2ba..000000000 --- a/package/mnemoc/lvs/pkg_linux24-header_pre.conf +++ /dev/null @@ -1,23 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/lvs/pkg_linux24-header_pre.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. $base/package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/package/mnemoc/lvs/pkg_linux24-src_pre.conf b/package/mnemoc/lvs/pkg_linux24-src_pre.conf deleted file mode 100644 index e2ef162d4..000000000 --- a/package/mnemoc/lvs/pkg_linux24-src_pre.conf +++ /dev/null @@ -1,23 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/lvs/pkg_linux24-src_pre.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -. $base/package/mnemoc/lvs/pkg_linux24_pre.conf diff --git a/package/mnemoc/lvs/pkg_linux24_pre.conf b/package/mnemoc/lvs/pkg_linux24_pre.conf deleted file mode 100644 index 23b8713b0..000000000 --- a/package/mnemoc/lvs/pkg_linux24_pre.conf +++ /dev/null @@ -1,52 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/mnemoc/lvs/pkg_linux24_pre.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -echo_status "Including IP Virtual Server (lvs) patch..." - -pkg_lvs_confdir=$base/package/mnemoc/lvs -pkg_lvs_archdir=$base/download/mnemoc/lvs - -pkg_lvs_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_lvs_confdir}/lvs.desc` -pkg_lvs_srctar="ipvs-$pkg_lvs_ver.tar.bz2" - -pkg_lvs_tempdir=`mktemp -d` -pushd $pkg_lvs_tempdir > /dev/null -tar $taropt $pkg_lvs_archdir/$pkg_lvs_srctar -cd * ; for x in *.diff; do - mv "$x" "lvs-$pkg_lvs_ver-${x%.diff}.patch" -done -rm -rf ipvs/ipvsadm -mv ipvs/linux_net_ipv4_ipvs_Makefile ipvs/Makefile -popd > /dev/null - -pkg_lvs_patchdir=$pkg_lvs_tempdir/ipvs-$pkg_lvs_ver - -# pre/postpatch actions.... add ipvs source -hook_add prepatch 4 "cp -vrp $pkg_lvs_patchdir/ipvs net/ipv4" -hook_add postpatch 4 "rm -rf $pkg_lvs_tempdir" - -# configure kernel -var_append confscripts ' ' "$pkg_lvs_confdir/kernel.conf.sh" - -# patch kernel -patchfiles="$patchfiles `echo $pkg_lvs_patchdir/*.patch`" -