Respin build system patch into a form for submission to upstream.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 13 insertions, 17 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 540391912822..6301448dcbe0 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ipvsadm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.59 2013/11/02 06:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.60 2013/11/02 06:52:16 robbat2 Exp $
+
+  02 Nov 2013; Robin H. Johnson <robbat2@gentoo.org>
+  files/ipvsadm-1.27-buildsystem.patch:
+  Respin build system patch into a form for submission to upstream.
 
 *ipvsadm-1.27 (02 Nov 2013)
 
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index e8912922596c..78dfec61bec1 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,6 +1,6 @@
 AUX ipvsadm-1.26-buildsystem.patch 2989 SHA256 88391e5122dbb7d8c92385647b2e8856bf7ad7231cfb2e73eda4e422addce198 SHA512 0802a919c947fed04774ec4034fba22036011e51802369d7c3c6a44ec7d118011aeac0ce3f7e2cb607efff133242c782ac8708b4ec3bb890c0013ad5d14863f8 WHIRLPOOL a5a723095f5dd158490f9d6e68a9288da65e5c16a789494863dadb1d2c786e0e1816e1b39a826a475c54f0413d3c508a5d5303cb129bed9d6e0e1640a8ac4881
 AUX ipvsadm-1.26-stack_smashing.patch 912 SHA256 78cf4f4d79fb2a39afdb532e46793c4e700fa08ecacd9fa2577d53b5ced389bd SHA512 b1b50914003e0bf8688bb7e2fe011242f2ec11df70e890f4af578780367c0d38718a47a942a0cef48088a85b36276896508a8b5d580d7a15a29ae20d5ae46b4c WHIRLPOOL 267d1580c793b6f9d90b39147cccc4c4dcdfdb67999884070e1fde279c72e77c9bbfa35f2adeb104c9ae0046e2d6f75598fd7de9205b56259c4caa2268427b12
-AUX ipvsadm-1.27-buildsystem.patch 3845 SHA256 6bdd76114fa80216aba0d470abfc348db7342a8c624d895590a22ec031eadc86 SHA512 480d885b49a912dc83a99dd48cd360262a34684916ac1300093252a76a0244189606c0b01779b9ec0e9a5cb4a5cb721373d319ada3086d7b373afe223bf047ac WHIRLPOOL daf5c8fde5657b74b46b18f0c763489432282f908e89be9b24d83a469cb3b7966ca791cc31501cdf1b8af2af20f335167ae0f4d7197c52576be1cde67be7c1b0
+AUX ipvsadm-1.27-buildsystem.patch 3563 SHA256 4ccf6260fc44a105e41e598b54ffb156b519b7d8cbd7def25c5285f9a3aa08f2 SHA512 5ff16df5fb2e612413f0349eb41161f7f32ece7e56750fd261310df552a940a615c6a5a117bf58711bcb38af439c8cd2222b740ca2bb2f253f0bf8dea630f959 WHIRLPOOL 20acdac7e7a62f62d0e70efbdd56486edab6bab0eb33324f19dab179aa00327b0d9a84709930b32354890216651237abce9740149dabc521a6f360818d732fa8
 AUX ipvsadm-init 763 SHA256 3dfaa6cb9ef4db6428424bb8097daa3f202bb51d5acf6a864c3829eeacb3e76f SHA512 44d95535b6b11338cac9353f2d84636828d9acc563a45f7d35b5eb22c1a3961e7242fc8e71c9e86986e0721cc5f2f7e60f32428118a0d55eb2482e19da039b6c WHIRLPOOL 602b269b5ba3eaa597acda1e4341c35e375ed64db54b711abdc12281c8527f19c26564a3681c098596af349a50e29ef513620b926b4a4770b24308f780a37223
 DIST ipvsadm-1.21-11.tar.gz 34030 SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa
 DIST ipvsadm-1.24.tar.gz 32007 SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a
@@ -10,5 +10,5 @@ EBUILD ipvsadm-1.21-r1.ebuild 1296 SHA256 c6ebaf3186b461fd6e1a3d4c982d0505d64af7
 EBUILD ipvsadm-1.24.ebuild 1390 SHA256 4af7355f2aa495346c3941bbbd3240bf10085a8188b7ff47c2d728f0c3365d12 SHA512 9976f4e98757fb288d1155be5b9d6af3086d7ecd3034c54b1c2e9643b79839ae2cc24f2eed550c3bcd9ff9a584300f9d587b51f74bea941917eeb882b870ab07 WHIRLPOOL c6f6e2b13b4cdff48423c62c5fc02aa9981ff1a95be59f5e7f0aa643c4cb83ab51c13bca2f3b7d64da441d48ce22b9e13a5a730115e15aa3579820821135772b
 EBUILD ipvsadm-1.26-r2.ebuild 1585 SHA256 4269b6750881c3fd3d0cb5fd5d9dbfd584e182df83c0ba2d941be9f0b271e06f SHA512 3f29eb5eab3af14a9a1d4264ecaad2bc80778d32439c234a9e4e6a3a245f6275264d3c779fd194ea2a017c23dd589367ea09d2794f535485e3408959ddc5350e WHIRLPOOL 50cccadeeb15437dbe5778f00191f579c3dc9fc8ffdd9420a1b65de96ac67f671a28db40782d886283ee497f83971dd4223faf068a022b89c3b83cd05d6292fc
 EBUILD ipvsadm-1.27.ebuild 1629 SHA256 66b76810ea29f48c506f370bc640d52ae78bef3225738b8f2d90c2ead10c7519 SHA512 c6fe49294c20013a4d260a2926481812dc04f0da83e1df26f3cfdd35100517f5bdfce541142b73ec8240497bda2379b4c2c3856570ed0ad4fd4287b405378aeb WHIRLPOOL 740b7299500da98cfaf7951345155a0fe4d521cb1439f8b072ccdb734e16c4517133f04b10352fc4c3cae3be9b6a800ceda9bf9463e9dd08fa9d84b010e13428
-MISC ChangeLog 8290 SHA256 d55a18b1d8ab80221cb3b55a386e1f8f8c984c93c81e524e688b5a760d3d8ff8 SHA512 0e1e1200537c0cd92c1e68dc3074a8b5c5f3d5942aab7ba4446a270d7b86b1e47833677ea05934286dac0a07ce7cbd274092e010551cb46f849496de736d4548 WHIRLPOOL 15edc33bdce4c72577ad2d326b43b9c53e237c167f2159443782393ed6fc43832d2a9915db3bd5d9bebb65a5bfc6b702adc43252149f747cf007157ff626520f
+MISC ChangeLog 8452 SHA256 8c86e2048f1c969f4f1724e01b876593b45f5088c182909a138f1c30155b0d86 SHA512 457638af3002103ef948fe1879122e354f97392312e93b49be851aa65e5f47b201b27e0656391f263dc8f30b39123179a5ef640f3f2460fbe96ebf77c909f396 WHIRLPOOL 23f77274429541b681f15029358ca551aca599d5dd3dedcd180cf6afb444decd941853079e49c8a047b577f165132f1933847b0bce9fefdb1953470f51050d95
 MISC metadata.xml 265 SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda SHA512 dbfb05fc749fe4054b1e49ceacc75dd8e6d5b804abd4928f5d38e0e96caa7ad7817de7246275a3c4aabff79f0db8f90252380761f2bb0786c70da0b531ddf02f WHIRLPOOL 6ec1181688c423dd6895171f4cf7fa9a3012be94f5918dbfda2188d477ce59a659df232d1ae368e50fc1da34b35697d49394f63015ca1a711da5cc972f890aef
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
index 50a50f2e00a7..cfc19e6c251f 100644
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
+++ b/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
@@ -1,6 +1,6 @@
 diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/libipvs/Makefile ipvsadm-1.27/libipvs/Makefile
 --- ipvsadm-1.27.orig/libipvs/Makefile	2013-09-06 01:37:27.000000000 -0700
-+++ ipvsadm-1.27/libipvs/Makefile	2013-11-01 23:31:14.359495884 -0700
++++ ipvsadm-1.27/libipvs/Makefile	2013-11-01 23:45:21.633636401 -0700
 @@ -1,9 +1,9 @@
  # Makefile for libipvs
  
@@ -61,8 +61,8 @@ diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/libipvs/
  
  distclean:	clean
 diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile ipvsadm-1.27/Makefile
---- ipvsadm-1.27.orig/Makefile	2013-09-06 01:37:27.000000000 -0700
-+++ ipvsadm-1.27/Makefile	2013-11-01 23:31:44.259015958 -0700
+--- ipvsadm-1.27.orig/Makefile	2013-11-01 23:49:36.523225124 -0700
++++ ipvsadm-1.27/Makefile	2013-11-01 23:49:09.478738760 -0700
 @@ -43,14 +43,13 @@
  INIT		= $(BUILD_ROOT)/etc/rc.d/init.d
  MKDIR		= mkdir
@@ -96,19 +96,11 @@ diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile
 +		$(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS)
  
 -install:        all
-+install:
++install:	all
  		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
  		$(INSTALL) -m 0755 ipvsadm $(SBIN)
  		$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
-@@ -98,15 +99,13 @@
- 		$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
- 		$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
- 		$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
--		[ -d $(INIT) ] || $(MKDIR) -p $(INIT)
--		$(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
- 
- clean:
- 		rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
+@@ -106,7 +107,7 @@
  		rm -rf debian/tmp
  		find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \
  		  -o -name "*.rej" -o -name core | xargs rm -f
@@ -117,7 +109,7 @@ diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile
  
  distclean:	clean
  
-@@ -139,4 +138,4 @@
+@@ -139,4 +140,4 @@
  		dpkg-buildpackage
  
  %.o:	%.c