- introduced _autostrip* as a general solution to adjust stripping options without...

[packages/rpm.git] / rpm-etc_dir.patch

diff --git a/rpm-etc_dir.patch b/rpm-etc_dir.patch
index 3fb44d51442b98bf74667272171ca4f3c97229d2..d296f2290506d367758f4a46b1bd2493174ab658 100644 (file)
--- a/rpm-etc_dir.patch
+++ b/rpm-etc_dir.patch
@@ -1,27 +1,15 @@
 diff -Nru rpm-4.1/lib/rpmrc.c rpm-4.1.new/lib/rpmrc.c
 --- rpm-4.1/lib/rpmrc.c        Tue Aug 20 16:53:44 2002
 +++ rpm-4.1.new/lib/rpmrc.c    Tue Mar 11 18:41:48 2003
-@@ -1756,27 +1756,39 @@
+@@ -1820,23 +1820,37 @@
        /* Expand ~/ to $HOME/ */
        fn[0] = '\0';
        if (r[0] == '~' && r[1] == '/') {
-+                      const char * etc_dir = getenv("HOME_ETC");
++          const char * etc_dir = getenv("HOME_ETC");
            const char * home = getenv("HOME");
 -          if (home == NULL) {
-+                      if (etc_dir) {
-+              if (strlen(etc_dir) > (sizeof(fn) - strlen(r))) {
-+                                      rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME_ETC is too large.\n"),r);
-+                                      rc = 1;
-+                                      break;
-+              }
-+              strcpy(fn, etc_dir);
-+                              strncat(fn, "/", sizeof(fn) - strlen(fn));                              
-+                r+=2;
-+              
-+                      } else {
-+              if (home == NULL) {
-           /* XXX Only /usr/lib/rpm/rpmrc must exist in default rcfiles list */
--              if (rcfiles == defrcfiles && myrcfiles != r)
+-          /* XXX Only /usr/lib/rpm/rpmrc must exist in default rcfiles list */
+-              if (rcfiles == rpmRcfiles && myrcfiles != r)
 -                  continue;
 -              rpmError(RPMERR_RPMRC, _("Cannot expand %s\n"), r);
 -              rc = 1;
@@ -29,46 +17,53 @@ diff -Nru rpm-4.1/lib/rpmrc.c rpm-4.1.new/lib/rpmrc.c
 -          }
 -          if (strlen(home) > (sizeof(fn) - strlen(r))) {
 -              rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
-+                      if (rcfiles == defrcfiles && myrcfiles != r)
-+                      continue;
-+                      rpmError(RPMERR_RPMRC, _("Cannot expand %s\n"), r);
-+                      rc = 1;
-+                      break;
-+              }
-+              if (strlen(home) > (sizeof(fn) - strlen(r))) {
-+                      rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
-                               r);
+-                              r);
 -              rc = 1;
 -              break;
--          }
++          if (etc_dir) {
++                  if (strlen(etc_dir) > (sizeof(fn) - strlen(r))) {
++                          rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME_ETC is too large.\n"),r);
++                          rc = 1;
++                          break;
++                  }
++                  strcpy(fn, etc_dir);
++                  strncat(fn, "/", sizeof(fn) - strlen(fn));
++                  r+=2;
++          } else {
++                  if (home == NULL) {
++                          /* XXX Only /usr/lib/rpm/rpmrc must exist in default rcfiles list */
++                          if (rcfiles == rpmRcfiles && myrcfiles != r)
++                                  continue;
++                          rpmError(RPMERR_RPMRC, _("Cannot expand %s\n"), r);
++                          rc = 1;
++                          break;
++                  }
++                  if (strlen(home) > (sizeof(fn) - strlen(r))) {
++                          rpmError(RPMERR_RPMRC, _("Cannot read %s, HOME is too large.\n"),
++                                          r);
++                          rc = 1;
++                          break;
++                  }
++                  strcpy(fn, home);
++                  r++;
+           }
 -          strcpy(fn, home);
 -          r++;
--      }
--      strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
--      fn[sizeof(fn)-1] = '\0';
--
-+                      rc = 1;
-+                      break;
-+              }
-+              strcpy(fn, home);
-+                r++;
-+                      }
-+              }
-+              strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
-+              fn[sizeof(fn)-1] = '\0';
-       /* Read another rcfile */
-       fd = Fopen(fn, "r.fpio");
-       if (fd == NULL || Ferror(fd)) {
---- rpm-4.3/po/pl.po.orig      2003-06-10 23:59:11.000000000 +0200
-+++ rpm-4.3/po/pl.po   2003-06-11 00:06:16.000000000 +0200
-@@ -2834,6 +2834,10 @@
- msgid "Please contact rpm-list@redhat.com\n"
- msgstr "Proszê skontaktowaæ siê z rpm-list@redhat.com\n"
++
++
+       }
+       strncat(fn, r, sizeof(fn) - (strlen(fn) + 1));
+       fn[sizeof(fn)-1] = '\0';
+--- rpm-4.4.8/po/pl.po.orig    2007-04-08 16:11:42.125435004 +0200
++++ rpm-4.4.8/po/pl.po 2007-04-08 16:25:11.343549717 +0200
+@@ -3251,6 +3251,10 @@
+ msgid "Cannot expand %s\n"
+ msgstr "Nie mo¿na rozwin±æ %s\n"
  
-+#: lib/rpmrc.c:1764
++#: lib/rpmrc.c:1935
 +msgid "Cannot read %s, HOME_ETC is too large.\n"
 +msgstr "Nie mo¿na odczytaæ %s, HOME_ETC jest zbyt du¿e.\n"
 +
- #: lib/rpmrc.c:1813
+ #: lib/rpmrc.c:1924
  #, c-format
- msgid "Cannot expand %s\n"
+ msgid "Cannot read %s, HOME is too large.\n"