* [ipvsadm PATCH 1/3] Make README more generic and reference new kernel.org location
2013-09-05 11:23 [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Jesper Dangaard Brouer
@ 2013-09-05 11:23 ` Jesper Dangaard Brouer
2013-09-05 11:23 ` [ipvsadm PATCH 2/3] Add MAINTAINERS style file Jesper Dangaard Brouer
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Jesper Dangaard Brouer @ 2013-09-05 11:23 UTC (permalink / raw)
To: lvs-devel, Simon Horman
Cc: Wensong Zhang, Julian Anastasov, Hans Schillstrom,
Ryan O'Hara
The old README were written for Version 1.20 - 18th September 2001.
Change this to be more generic for future releases.
Make it clear that SCM/git repository have been moved to kernel.org:
https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
And release tarball also have moved to kernel.org:
https://kernel.org/pub/linux/utils/kernel/ipvsadm/
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
README | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/README b/README
index 54474e5..2e62008 100644
--- a/README
+++ b/README
@@ -1,21 +1,31 @@
--------------------------------------------------------------------------
-ipvsadm - Version 1.20 - 18th September 2001
+ipvsadm
This is free software. See below for details.
-ipvsadm is a utility to administer the IP virtual server services
-offered by the Linux kernel with IP virtual server support.
+ipvsadm is a utility to administer the IP Virtual Server (IPVS)
+services offered by the Linux kernel with IPVS support to create a
+wide range of load-balancer setups.
-This version of ipvsadm requires IPVS module v0.9.7 for kernel 2.4 or
-later. Check out the Linux Virtual Server Project home page on the
+Check out the Linux Virtual Server Project home page on the
World Wide Web:
http://www.LinuxVirtualServer.org/
or
http://www.Linux-VS.org/
-for the most recent information and original sources about ipvsadm.
+for the most recent information about ipvsadm.
-To make, make sure your Linux kernel is already patched with IPVS and
+Releases can be downloaded from:
+ https://kernel.org/pub/linux/utils/kernel/ipvsadm/
+
+The source code is available via git from kernel.org:
+ https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
+ git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
+
+A wikipage is available at:
+ http://kb.linuxvirtualserver.org/wiki/Main_Page
+
+To make, make sure your Linux kernel is compiled with IPVS, e.g. by invoking
"make menuconfig" or "make xconfig" to setup the right compiling options,
see the README of the virtual server patch for detail, then simply type
make
@@ -35,7 +45,7 @@ in the source directory.
Wensong Zhang <wensong@linuxvirtualserver.org>
^ permalink raw reply related [flat|nested] 10+ messages in thread* [ipvsadm PATCH 2/3] Add MAINTAINERS style file
2013-09-05 11:23 [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Jesper Dangaard Brouer
2013-09-05 11:23 ` [ipvsadm PATCH 1/3] Make README more generic and reference new kernel.org location Jesper Dangaard Brouer
@ 2013-09-05 11:23 ` Jesper Dangaard Brouer
2013-09-05 11:23 ` [ipvsadm PATCH 3/3] Maintainer script for releasing tarballs Jesper Dangaard Brouer
2013-09-05 19:33 ` [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Julian Anastasov
3 siblings, 0 replies; 10+ messages in thread
From: Jesper Dangaard Brouer @ 2013-09-05 11:23 UTC (permalink / raw)
To: lvs-devel, Simon Horman
Cc: Wensong Zhang, Julian Anastasov, Hans Schillstrom,
Ryan O'Hara
Adding a MAINTAINERS file, to make it more clear who is maintaining
the different parts of the IPVS project.
Borrowing the kernel style MAINTAINERS listing.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
MAINTAINERS | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 0000000..bd14d45
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,33 @@
+
+List of maintainers for the different parts of the IPVS project.
+(using kernel style MAINTAINERS listing)
+
+Userspace ipvsadm tool (this tool)
+M: Jesper Dangaard Brouer <brouer@redhat.com>
+M: Simon Horman <horms@verge.net.au>
+T: git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
+W: https://kernel.org/pub/linux/utils/kernel/ipvsadm/ (tarballs)
+L: lvs-devel@vger.kernel.org
+L: lvs-users@linuxvirtualserver.org
+
+Kernel IPVS
+M: Simon Horman <horms@verge.net.au>
+M: Julian Anastasov <ja@ssi.bg>
+M: Wensong Zhang <wensong@linux-vs.org>
+L: netdev@vger.kernel.org
+L: lvs-devel@vger.kernel.org
+S: Maintained
+F: Documentation/networking/ipvs-sysctl.txt
+F: include/net/ip_vs.h
+F: include/uapi/linux/ip_vs.h
+F: net/netfilter/ipvs/
+
+Homepage: http://www.linuxvirtualserver.org/
+M: Wensong Zhang <wensong@linux-vs.org>
+W: http://www.linuxvirtualserver.org/
+W: http://www.Linux-vs.org/
+
+Wikipage: http://kb.linuxvirtualserver.org/
+M: Wensong Zhang <wensong@linux-vs.org>
+M: Jesper Dangaard Brouer <brouer@redhat.com>
+W: http://kb.linuxvirtualserver.org/wiki/Main_Page
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [ipvsadm PATCH 3/3] Maintainer script for releasing tarballs
2013-09-05 11:23 [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Jesper Dangaard Brouer
2013-09-05 11:23 ` [ipvsadm PATCH 1/3] Make README more generic and reference new kernel.org location Jesper Dangaard Brouer
2013-09-05 11:23 ` [ipvsadm PATCH 2/3] Add MAINTAINERS style file Jesper Dangaard Brouer
@ 2013-09-05 11:23 ` Jesper Dangaard Brouer
2013-09-05 19:33 ` [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Julian Anastasov
3 siblings, 0 replies; 10+ messages in thread
From: Jesper Dangaard Brouer @ 2013-09-05 11:23 UTC (permalink / raw)
To: lvs-devel, Simon Horman
Cc: Wensong Zhang, Julian Anastasov, Hans Schillstrom,
Ryan O'Hara
Adding a script (release-tarball.sh) for making a release
tarball, where we avoid including files not related to the git
repository, by using git archive to a temp dir (mktemp).
You need to create a git tag corrosponding with the version in the
file VERSION, before you can make a release. For testing purposes,
its possible to give a commit id on the command line via "-c" option.
The script also creates a GPG signed file output of the uncompressed
tarball (which is needed by kernel.org upload utility). A specific
GPGKEY ID can be specified on the command line via "-g" option.
The release tarballs and GPG signing files are placed in the
directory "release/".
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
release-tarball.sh | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
create mode 100755 release-tarball.sh
diff --git a/release-tarball.sh b/release-tarball.sh
new file mode 100755
index 0000000..2333fde
--- /dev/null
+++ b/release-tarball.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# Script for making a release tarball, where we avoid including files
+# not related to the git repository, by using git archive to a temp
+# dir (mktemp).
+#
+# You need to create a git tag corrosponding with the version in the
+# file VERSION, before you can make a release. For testing purposes,
+# its possible to give a commit id on the command line via "-c" option.
+#
+# The script also creates a GPG signed file output of the uncompressed
+# tarball (which is needed by kernel.org upload utility). A specific
+# GPGKEY ID can be specified on the command line via "-g" option.
+#
+# The release tarballs and GPG signing files are placed in the
+# directory "release/".
+#
+set -e
+NAME=ipvsadm
+#PREV_VERSION=1.xx # disabled in script
+
+if [ -e VERSION ]; then
+ export VERSION=$(cat VERSION)
+else
+ echo "ERROR - Cannot find version file"
+ exit 1
+fi
+VERSION_TAG="v${VERSION}"
+# Notice VERSION can be overridden by command line arg -c
+
+## --- Parse command line arguments ---
+while getopts "c:g:" option; do
+ case $option in
+ c)
+ COMMIT=$OPTARG
+ echo "[WARNING] using git commit/id ($COMMIT) instead of release tag"
+ VERSION=$COMMIT
+ VERSION_TAG=$COMMIT
+ git show $COMMIT > /dev/null
+ ;;
+ g)
+ SPECIFIC_GPGKEY=$OPTARG
+ echo "[NOTICE] Using GPG signing key: $SPECIFIC_GPGKEY"
+ gpg --list-key "$SPECIFIC_GPGKEY" > /dev/null
+ ;;
+ ?|*)
+ echo ""
+ echo "[ERROR] Unknown parameter \"$OPTARG\""
+ exit 2
+ esac
+done
+shift $[ OPTIND - 1 ]
+
+if [ -n "$SPECIFIC_GPGKEY" ]; then
+ GPGKEY="-u $SPECIFIC_GPGKEY"
+fi
+
+echo "Creating tarball for release tag: $VERSION_TAG"
+echo "================================="
+
+read -p "Are you sure, you want to create a release tarball (y/n)? " -n 1 -r
+echo ""
+if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then
+ exit 1
+fi
+
+# Create a unique tempdir, to avoid leftovers from older release builds
+TMPDIR=`mktemp -dt $NAME.XXXXXXXXXX`
+trap 'rm -rf $TMPDIR' EXIT
+#echo "TMPDIR:$TMPDIR"
+PKGDIR="$TMPDIR/${NAME}-${VERSION}"
+#echo PKGDIR:$PKGDIR
+RELDIR=release
+if [ ! -d $RELDIR ]; then
+ mkdir -p $RELDIR
+fi
+
+# Compression packer tool
+packer=gzip
+packext=gz
+
+TARBALL="$RELDIR/$NAME-$VERSION.tar";
+#CHANGES="$RELDIR/changes-$NAME-$PREV_VERSION-$VERSION.txt";
+
+#mkdir -p "$TMPDIR"
+#echo " -- Git shortlog v$PREV_VERSION..$VERSION_TAG"
+#git shortlog "v$PREV_VERSION..$VERSION_TAG" > "$CHANGES"
+
+echo " -- Git archiving version tag $VERSION_TAG"
+git archive --prefix="$NAME-$VERSION/" "$VERSION_TAG" | tar -xC "$TMPDIR/"
+
+#pushd "$PKGDIR" > /dev/null && {
+# echo " -- Generating configure scripts..."
+# sh autogen.sh
+# popd > /dev/null
+#}
+
+# Create .spec file
+export RELEASE=1
+if [ -f ipvsadm.spec.in ]; then
+ echo " -- Creating .spec file"
+ sed -e "s/@@VERSION@@/${VERSION}/g" \
+ -e "s/@@RELEASE@@/${RELEASE}/g" \
+ < ipvsadm.spec.in > ${PKGDIR}/ipvsadm.spec
+fi
+
+echo " -- Creating tarball $TARBALL"
+#tar --use=${packer} -C "$TMPDIR" -cf "$TARBALL" "$NAME-$VERSION";
+tar -C "$TMPDIR" -cf "$TARBALL" "$NAME-$VERSION";
+
+#(Disabled checksums are auto created by kernel.org kup scripts)
+#echo " -- Calculating checksums"
+#md5sum "$TARBALL" > "${TARBALL}.md5sum";
+#sha1sum "$TARBALL" > "${TARBALL}.sha1sum";
+
+echo " -- You need to sign the tarball (uncompressed)"
+gpg $GPGKEY --armor --detach-sign "$TARBALL";
+
+echo " -- Compress tarball to ${TARBALL}.${packext}"
+${packer} "$TARBALL"
+
+echo "MANUAL: Upload to kernel.org, via command:"
+echo kup put ${TARBALL}.${packext} ${TARBALL}.asc /pub/linux/utils/kernel/ipvsadm/
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-05 11:23 [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Jesper Dangaard Brouer
` (2 preceding siblings ...)
2013-09-05 11:23 ` [ipvsadm PATCH 3/3] Maintainer script for releasing tarballs Jesper Dangaard Brouer
@ 2013-09-05 19:33 ` Julian Anastasov
2013-09-06 2:20 ` Simon Horman
3 siblings, 1 reply; 10+ messages in thread
From: Julian Anastasov @ 2013-09-05 19:33 UTC (permalink / raw)
To: Jesper Dangaard Brouer
Cc: lvs-devel, Simon Horman, Wensong Zhang, Hans Schillstrom,
Ryan O'Hara
Hello,
On Thu, 5 Sep 2013, Jesper Dangaard Brouer wrote:
> Here are some patches in preparation for the upcomming ipvsadm release
> v1.27. No real coded changes to ipvsadm, just maintainer related
> updates and changes.
>
> If nobody objects and when Simon ACKs, I'm going to apply this
> patchset myself to the ipvsadm git tree:
>
> https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
Patchset looks ok to me.
> ---
>
> Jesper Dangaard Brouer (3):
> Make README more generic and reference new kernel.org location
> Add MAINTAINERS style file
> Maintainer script for releasing tarballs
>
>
> MAINTAINERS | 33 ++++++++++++++
> README | 26 ++++++++---
> release-tarball.sh | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 174 insertions(+), 8 deletions(-)
> create mode 100644 MAINTAINERS
> create mode 100755 release-tarball.sh
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-05 19:33 ` [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27 Julian Anastasov
@ 2013-09-06 2:20 ` Simon Horman
2013-09-06 7:48 ` Jesper Dangaard Brouer
0 siblings, 1 reply; 10+ messages in thread
From: Simon Horman @ 2013-09-06 2:20 UTC (permalink / raw)
To: Julian Anastasov
Cc: Jesper Dangaard Brouer, lvs-devel, Wensong Zhang,
Hans Schillstrom, Ryan O'Hara
On Thu, Sep 05, 2013 at 10:33:10PM +0300, Julian Anastasov wrote:
>
> Hello,
>
> On Thu, 5 Sep 2013, Jesper Dangaard Brouer wrote:
>
> > Here are some patches in preparation for the upcomming ipvsadm release
> > v1.27. No real coded changes to ipvsadm, just maintainer related
> > updates and changes.
> >
> > If nobody objects and when Simon ACKs, I'm going to apply this
> > patchset myself to the ipvsadm git tree:
> >
> > https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
>
> Patchset looks ok to me.
It looks good to me too.
Acked-by: Simon Horman <horms@verge.net.au>
Please feel free to push this if you haven't done so already.
>
> > ---
> >
> > Jesper Dangaard Brouer (3):
> > Make README more generic and reference new kernel.org location
> > Add MAINTAINERS style file
> > Maintainer script for releasing tarballs
> >
> >
> > MAINTAINERS | 33 ++++++++++++++
> > README | 26 ++++++++---
> > release-tarball.sh | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 174 insertions(+), 8 deletions(-)
> > create mode 100644 MAINTAINERS
> > create mode 100755 release-tarball.sh
>
> Regards
>
> --
> Julian Anastasov <ja@ssi.bg>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-06 2:20 ` Simon Horman
@ 2013-09-06 7:48 ` Jesper Dangaard Brouer
2013-09-06 8:05 ` Simon Horman
0 siblings, 1 reply; 10+ messages in thread
From: Jesper Dangaard Brouer @ 2013-09-06 7:48 UTC (permalink / raw)
To: Simon Horman
Cc: Julian Anastasov, Jesper Dangaard Brouer, lvs-devel,
Wensong Zhang, Hans Schillstrom, Ryan O'Hara
[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]
On Fri, 6 Sep 2013 11:20:25 +0900 Simon Horman <horms@verge.net.au> wrote:
> On Thu, Sep 05, 2013 at 10:33:10PM +0300, Julian Anastasov wrote:
> >
> > On Thu, 5 Sep 2013, Jesper Dangaard Brouer wrote:
> >
> > > Here are some patches in preparation for the upcomming ipvsadm release
> > > v1.27. No real coded changes to ipvsadm, just maintainer related
> > > updates and changes.
> > >
> > > If nobody objects and when Simon ACKs, I'm going to apply this
> > > patchset myself to the ipvsadm git tree:
> > >
> > > https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
> >
> > Patchset looks ok to me.
>
> It looks good to me too.
>
> Acked-by: Simon Horman <horms@verge.net.au>
>
> Please feel free to push this if you haven't done so already.
Thanks. I just did a push of the patches to ipvsadm.git :-)
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Sr. Network Kernel Developer at Red Hat
Author of http://www.iptv-analyzer.org
LinkedIn: http://www.linkedin.com/in/brouer
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 230 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-06 7:48 ` Jesper Dangaard Brouer
@ 2013-09-06 8:05 ` Simon Horman
2013-09-06 8:13 ` Jesper Dangaard Brouer
0 siblings, 1 reply; 10+ messages in thread
From: Simon Horman @ 2013-09-06 8:05 UTC (permalink / raw)
To: Jesper Dangaard Brouer
Cc: Julian Anastasov, lvs-devel, Wensong Zhang, Hans Schillstrom,
Ryan O'Hara
On Fri, Sep 06, 2013 at 09:48:55AM +0200, Jesper Dangaard Brouer wrote:
>
> On Fri, 6 Sep 2013 11:20:25 +0900 Simon Horman <horms@verge.net.au> wrote:
>
> > On Thu, Sep 05, 2013 at 10:33:10PM +0300, Julian Anastasov wrote:
> > >
> > > On Thu, 5 Sep 2013, Jesper Dangaard Brouer wrote:
> > >
> > > > Here are some patches in preparation for the upcomming ipvsadm release
> > > > v1.27. No real coded changes to ipvsadm, just maintainer related
> > > > updates and changes.
> > > >
> > > > If nobody objects and when Simon ACKs, I'm going to apply this
> > > > patchset myself to the ipvsadm git tree:
> > > >
> > > > https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
> > >
> > > Patchset looks ok to me.
> >
> > It looks good to me too.
> >
> > Acked-by: Simon Horman <horms@verge.net.au>
> >
> > Please feel free to push this if you haven't done so already.
>
> Thanks. I just did a push of the patches to ipvsadm.git :-)
Great. Are we waiting on anything to make a release?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-06 8:05 ` Simon Horman
@ 2013-09-06 8:13 ` Jesper Dangaard Brouer
2013-09-06 8:28 ` Simon Horman
0 siblings, 1 reply; 10+ messages in thread
From: Jesper Dangaard Brouer @ 2013-09-06 8:13 UTC (permalink / raw)
To: Simon Horman
Cc: Jesper Dangaard Brouer, Julian Anastasov, lvs-devel,
Wensong Zhang, Hans Schillstrom, Ryan O'Hara
On Fri, 6 Sep 2013 17:05:45 +0900 Simon Horman <horms@verge.net.au> wrote:
> Great. Are we waiting on anything to make a release?
Nope. Not really. I can do the release today/now if you like?
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Sr. Network Kernel Developer at Red Hat
Author of http://www.iptv-analyzer.org
LinkedIn: http://www.linkedin.com/in/brouer
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ipvsadm PATCH 0/3] Patchset in preparation for ipvsadm release v1.27
2013-09-06 8:13 ` Jesper Dangaard Brouer
@ 2013-09-06 8:28 ` Simon Horman
0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-09-06 8:28 UTC (permalink / raw)
To: Jesper Dangaard Brouer
Cc: Jesper Dangaard Brouer, Julian Anastasov, lvs-devel,
Wensong Zhang, Hans Schillstrom, Ryan O'Hara
On Fri, Sep 06, 2013 at 10:13:04AM +0200, Jesper Dangaard Brouer wrote:
>
> On Fri, 6 Sep 2013 17:05:45 +0900 Simon Horman <horms@verge.net.au> wrote:
>
> > Great. Are we waiting on anything to make a release?
>
> Nope. Not really. I can do the release today/now if you like?
I think that is an excellent idea.
^ permalink raw reply [flat|nested] 10+ messages in thread