- 4.4.1

Changed files:
    rpm-gcc4.patch -> 1.2
    rpm-rpmsq.patch -> 1.2

diff --git a/rpm-gcc4.patch b/rpm-gcc4.patch
index f216731dfb22fc2349ab262f909d81675242cf0b..40e863e899ee7fd4a69c41a705e5242e2be75a79 100644 (file)
--- a/rpm-gcc4.patch
+++ b/rpm-gcc4.patch
@@ -20,14 +20,3 @@
            }
            extensions++;
        }
---- rpm/python/rpmts-py.c.orig 2004-11-18 15:04:50.000000000 +0100
-+++ rpm/python/rpmts-py.c      2004-12-10 18:09:43.472027680 +0100
-@@ -24,7 +24,7 @@
- 
- /*@unchecked@*/
- /*@-shadow@*/
--static int _rpmts_debug = 0;
-+int _rpmts_debug = 0;
- /*@=shadow@*/
- 
- /*@access alKey @*/

diff --git a/rpm-rpmsq.patch b/rpm-rpmsq.patch
index e1f2e97da500d0303f06e5b83c7c1bc481b34f3a..03abbeb50920ba62cac66fe7e878d61e39960754 100644 (file)
--- a/rpm-rpmsq.patch
+++ b/rpm-rpmsq.patch
@@ -1,7 +1,7 @@
 diff -uNr rpm-4.3/rpmio/rpmsq.c rpm-4.3.fixed/rpmio/rpmsq.c
 --- rpm-4.3/rpmio/rpmsq.c      2004-01-04 03:13:09.000000000 +0100
 +++ rpm-4.3.fixed/rpmio/rpmsq.c        2004-02-04 20:29:39.000000000 +0100
-@@ -135,20 +135,20 @@
+@@ -140,20 +140,20 @@
  #define       DO_UNLOCK()     pthread_mutex_unlock(&rpmsigTbl_lock);
  #define       INIT_LOCK()     \
      { pthread_mutexattr_t attr; \
@@ -19,13 +19,12 @@ diff -uNr rpm-4.3/rpmio/rpmsq.c rpm-4.3.fixed/rpmio/rpmsq.c
  #define       SUB_REF(__tbl)  --(__tbl)->active
  #define       CLEANUP_HANDLER(__handler, __arg, __oldtypeptr) \
 -    (void) pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
-+      pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
++    pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
        pthread_cleanup_push((__handler), (__arg));
  #define       CLEANUP_RESET(__execute, __oldtype) \
--    (void) pthread_cleanup_pop(__execute); \
+     pthread_cleanup_pop(__execute); \
 -    (void) pthread_setcanceltype ((__oldtype), &(__oldtype));
-+      pthread_cleanup_pop(__execute); \
-+      pthread_setcanceltype ((__oldtype), &(__oldtype));
++    pthread_setcanceltype ((__oldtype), &(__oldtype));
  
  #define       SAME_THREAD(_a, _b)     pthread_equal(((pthread_t)_a), ((pthread_t)_b))