ditch legacy compatibility use of headerPut() causing segfault (#61690)

2 files changed, 4 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index da324bb..57ae770 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
-Version 4.0 - ? October 2010, by Per Øyvind Karlsen
+Version 4.1 - 17 Nov 2010, by Per Øyvind Karlsen
+- ditch legacy compatibility use of headerPut() causing segfault (#61690)
+ 
+Version 4.0 - 11 Nov 2010, by Per Øyvind Karlsen
 
 - add support for uncompressed & xz/lzma compressed synthesis
 - fix URPM::DB::open() to work properly with relative paths
diff --git a/URPM.xs b/URPM.xs
index a4ff87e..cbe9ca4 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -94,8 +94,6 @@ typedef struct s_Package* URPM__Package;
 #define FLAG_RATE_INVALID     0
 
 
-#define FILENAME_TAG 1000000
-
 #define FILTER_MODE_ALL_FILES     0
 #define FILTER_MODE_CONF_FILES    2
 
@@ -1391,20 +1389,11 @@ update_header(char *filename, URPM__Package pkg, __attribute__((unused)) int kee
 	if (fd != NULL && rpmReadPackageFile(ts, fd, filename, &header) == 0 && header) {
 	  char *basename;
 	  struct stat sb;
-	  HE_t he;
 
 	  basename = strrchr(filename, '/');
 	  Fstat(fd, &sb);
 	  Fclose(fd);
 
-	  /* this is only kept for compatibility with older distros
-	     (where ->filename on "unpacked" URPM::Package rely on FILENAME_TAG) */
-	  he = (HE_t)memset(alloca(sizeof(*he)), 0, sizeof(*he));
-          he->tag = FILENAME_TAG;
-          he->p.str = basename != NULL ? basename + 1 : filename;
-          he->c = 1;
-	  headerPut(header, he, 0);
-
 	  if (pkg->h && !(pkg->flag & FLAG_NO_HEADER_FREE)) pkg->h = headerFree(pkg->h);
 	  pkg->h = header;
 	  pkg->flag &= ~FLAG_NO_HEADER_FREE;