Clean up. Fixes bug 328655 as well.

(Portage version: 2.2_rc69/cvs/Linux x86_64)

6 files changed, 0 insertions, 229 deletions

diff --git a/net-misc/cfengine/files/cfengine-2.1-package-locking-fixup.patch b/net-misc/cfengine/files/cfengine-2.1-package-locking-fixup.patch
deleted file mode 100644
index 0c1531cdc91a..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1-package-locking-fixup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit d0dd5a50066ecb9e4857a7795ceed67832a37dc5
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Thu Dec 4 23:21:51 2008 -0800
-
-    Fix up locking for packages to avoid collision when the package name, cmp, action are the same, but defines and version are different.
-
-    There's a serious bug with the locking inside the packages method, that causes
-    lock names to collide when they shouldn't.
-    
-    Triggered with this code:
-    =====
-    packages:
-    any::
-    mail-mta/postfix cmp=lt version=2.3 action=none define=has_lt_postfix23
-    mail-mta/postfix cmp=lt version=2.4 action=none define=has_lt_postfix24
-    mail-mta/postfix cmp=lt version=2.5 action=none define=has_lt_postfix25
-    mail-mta/postfix cmp=lt version=2.6 action=none define=has_lt_postfix26
-    mail-mta/postfix cmp=ge version=2.3 action=none define=has_ge_postfix23
-    mail-mta/postfix cmp=ge version=2.4 action=none define=has_ge_postfix24
-    mail-mta/postfix cmp=ge version=2.5 action=none define=has_ge_postfix25
-    =====
-    
-    The lock is normally created in src/do.c as follows:
-    snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-    
-    Where name is based only on the first token.
-    The above comes down to only two locks:
-    packages.mail_mta_postfix_2_2
-    packages.mail_mta_postfix_3_2
-    
-    This means the other classes are never defined, and unless you look at the
-    debug output, the locking errors are not seen either.
-    
-    Attached are patches for the 2.1.x and 2.2.x series that alter the lock name to
-    include the version AND define/elsedefine blocks.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/src/do.c b/src/do.c
-index 55fc552..58454f2 100644
---- a/src/do.c
-+++ b/src/do.c
-@@ -2710,7 +2710,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->next)
-       ptr->done = 'y';
-       }
- 
--   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",ptr->name,ptr->cmp,ptr->action);
-+   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", ptr->name, ptr->cmp, ptr->ver ?: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
-    
-    if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
-       {
diff --git a/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
deleted file mode 100644
index 5f27e46f5a84..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1.22-db48-namespace-fix.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nuar cfengine-2.1.22.orig/src/cfenvd.c cfengine-2.1.22/src/cfenvd.c
---- cfengine-2.1.22.orig/src/cfenvd.c	2007-01-07 14:15:42.000000000 +0000
-+++ cfengine-2.1.22/src/cfenvd.c	2010-01-26 10:58:20.328601944 +0000
-@@ -69,8 +69,8 @@
- 
- char BATCHFILE[CF_BUFSIZE];
- char STATELOG[CF_BUFSIZE];
--char ENV_NEW[CF_BUFSIZE];
--char ENV[CF_BUFSIZE];
-+char CF_ENV_NEW[CF_BUFSIZE];
-+char CF_ENV[CF_BUFSIZE];
- 
- short TCPDUMP = false;
- short TCPPAUSE = false;
-@@ -284,8 +284,8 @@
-  
- snprintf(AVDB,CF_MAXVARSIZE,"%s/state/%s",CFWORKDIR,CF_AVDB_FILE);
- snprintf(STATELOG,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_STATELOG_FILE);
--snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
--snprintf(ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
-+snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENVNEW_FILE);
-+snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",CFWORKDIR,CF_ENV_FILE);
- 
- if (!BATCH_MODE)
-    {
-@@ -1070,9 +1070,9 @@
- 
- /* Publish class list */
- 
--unlink(ENV_NEW);
-+unlink(CF_ENV_NEW);
-  
--if ((fp = fopen(ENV_NEW,"a")) == NULL)
-+if ((fp = fopen(CF_ENV_NEW,"a")) == NULL)
-    {
-    DeleteItemList(PREVIOUS_STATE);
-    PREVIOUS_STATE = classlist;
-@@ -1095,7 +1095,7 @@
- DeleteItemList(ENTROPIES); 
- fclose(fp);
- 
--rename(ENV_NEW,ENV);
-+rename(CF_ENV_NEW,CF_ENV);
- }
- 
- /*********************************************************************/
-diff -Nuar cfengine-2.1.22.orig/src/cfetool.c cfengine-2.1.22/src/cfetool.c
---- cfengine-2.1.22.orig/src/cfetool.c	2006-01-29 15:34:23.000000000 +0000
-+++ cfengine-2.1.22/src/cfetool.c	2010-01-26 10:58:13.145262988 +0000
-@@ -157,8 +157,8 @@
- int time_to_update = false;
- int DEBUGGING = false;
- int DEBUGGING2 = false;
--char ENV_NEW[CF_BUFSIZE];
--char ENV[CF_BUFSIZE];
-+char CF_ENV_NEW[CF_BUFSIZE];
-+char CF_ENV[CF_BUFSIZE];
- 
- #define Debugging if(DEBUGGING) printf
- #define Debugging2 if(DEBUGGING2) printf
-@@ -267,8 +267,8 @@
-   }
-   strncpy(VLOCKDIR,WORKDIR,CF_BUFSIZE-1);
-   strncpy(VLOGDIR,WORKDIR,CF_BUFSIZE-1);
--  snprintf(ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
--  snprintf(ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
-+  snprintf(CF_ENV_NEW,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENVNEW_FILE);
-+  snprintf(CF_ENV,CF_BUFSIZE,"%s/state/%s",WORKDIR,CF_ENV_FILE);
-   argv += 2;
-   argc -= 2;
-   if (strcmp(command, "create") == 0)
-@@ -2437,7 +2437,7 @@
- 
-   if(cfenvd_compatible)
-   {
--    unlink(ENV_NEW);
-+    unlink(CF_ENV_NEW);
-     strcpy(temp1, NAME);
-     strcat(temp1, "_");
-     temp2[0] = '_';
-@@ -2452,12 +2452,12 @@
-       lock.l_whence = SEEK_SET;
-       lock.l_len = 0;
-  
--      if ((newfp = fopen(ENV_NEW,"a")) == NULL)
-+      if ((newfp = fopen(CF_ENV_NEW,"a")) == NULL)
-       {
-         DeleteItemList(classlist);
-         return code; 
-       }
--      if ((oldfp = fopen(ENV, "r")) != NULL)
-+      if ((oldfp = fopen(CF_ENV, "r")) != NULL)
-       {
-         if(fcntl(fileno(oldfp), F_SETLK, &lock) == -1)
-         {
-@@ -2481,7 +2481,7 @@
-  
-       fclose(newfp);
- 
--      rename(ENV_NEW,ENV);
-+      rename(CF_ENV_NEW,CF_ENV);
-       break;
-     }
-   }
diff --git a/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch b/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
deleted file mode 100644
index b4b40823bf17..000000000000
--- a/net-misc/cfengine/files/cfengine-2.1.22-package-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru 2.1.22-orig/src/package.c 2.1.22-r1/src/package.c
---- 2.1.22-orig/src/package.c   2007-03-09 11:48:31.000000000 -0800
-+++ cfengine-2.1.22/src/package.c     2007-03-09 11:50:26.000000000 -0800
-@@ -446,6 +446,7 @@
-          {
-          ReadLine(line,CF_BUFSIZE-1,pp);
-          snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
-+         CfLog(cfinform,OUTPUT,""); 
-          }
-       
-       if (cfpclose(pp) != 0)
diff --git a/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch b/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch
deleted file mode 100644
index 1a523df09dd5..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2-package-locking-fixup.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit bdd26de22a3e4e18d63709d61a788785d212aa45
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Thu Dec 4 23:20:32 2008 -0800
-
-    Fix up locking for packages to avoid collision when the package name, cmp, action are the same, but defines and version are different.
-    
-    There's a serious bug with the locking inside the packages method, that causes
-    lock names to collide when they shouldn't.
-    
-    Triggered with this code:
-    =====
-    packages:
-    any::
-    mail-mta/postfix cmp=lt version=2.3 action=none define=has_lt_postfix23
-    mail-mta/postfix cmp=lt version=2.4 action=none define=has_lt_postfix24
-    mail-mta/postfix cmp=lt version=2.5 action=none define=has_lt_postfix25
-    mail-mta/postfix cmp=lt version=2.6 action=none define=has_lt_postfix26
-    mail-mta/postfix cmp=ge version=2.3 action=none define=has_ge_postfix23
-    mail-mta/postfix cmp=ge version=2.4 action=none define=has_ge_postfix24
-    mail-mta/postfix cmp=ge version=2.5 action=none define=has_ge_postfix25
-    =====
-    
-    The lock is normally created in src/do.c as follows:
-    snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-    
-    Where name is based only on the first token.
-    The above comes down to only two locks:
-    packages.mail_mta_postfix_2_2
-    packages.mail_mta_postfix_3_2
-    
-    This means the other classes are never defined, and unless you look at the
-    debug output, the locking errors are not seen either.
-    
-    Attached are patches for the 2.1.x and 2.2.x series that alter the lock name to
-    include the version AND define/elsedefine blocks.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/src/do.c b/src/do.c
-index a01b177..9800cd6 100644
---- a/src/do.c
-+++ b/src/do.c
-@@ -2844,7 +2844,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->next)
- 
-    ExpandVarstring(ptr->name,name,"");
-    
--   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%d",name,ptr->cmp,ptr->action);
-+   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ?: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
-    
-    if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
-       {
diff --git a/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch b/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch
deleted file mode 100644
index db53583f6fe9..000000000000
--- a/net-misc/cfengine/files/cfengine-2.2.6-typo-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cfengine-2.2.6-orig/src/cfenvd.c cfengine-2.2.6/src/cfenvd.c
---- cfengine-2.2.6-orig/src/cfenvd.c	2008-04-21 23:26:19.000000000 -0700
-+++ cfengine-2.2.6/src/cfenvd.c	2008-04-28 12:08:46.000000000 -0700
-@@ -36,7 +36,7 @@
- #include "cf.defs.h"
- #include "cf.extern.h"
- #ifdef HAVE_SYS_LOADAVG_H
--v# include <sys/loadavg.h>
-+# include <sys/loadavg.h>
- #else
- # define LOADAVG_5MIN    1
- #endif
diff --git a/net-misc/cfengine/files/module-cfportage.tbz2 b/net-misc/cfengine/files/module-cfportage.tbz2
deleted file mode 100644
index df25be27d293..000000000000
--- a/net-misc/cfengine/files/module-cfportage.tbz2
+++ /dev/null