diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-05-14 15:14:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-05-14 15:14:17 +0000 |
| commit | 1bb226fcb7762c3cd8bbb9503d93653e994f0a1a (patch) | |
| tree | 832445325e69aa23d1568736f5c38142d8a80ccf /sys-apps/shadow | |
| parent | new posteinfo thanks to sha in #gentoo-anfaenger (diff) | |
| download | historical-1bb226fcb7762c3cd8bbb9503d93653e994f0a1a.tar.gz historical-1bb226fcb7762c3cd8bbb9503d93653e994f0a1a.tar.bz2 historical-1bb226fcb7762c3cd8bbb9503d93653e994f0a1a.zip | |
dont use i64c to implement l64a #132666
Package-Manager: portage-2.1_rc1
Diffstat (limited to 'sys-apps/shadow')
| -rw-r--r-- | sys-apps/shadow/Manifest | 14 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch | 42 |
2 files changed, 38 insertions, 18 deletions
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest index 8b45b3966ae7..f9beb33231be 100644 --- a/sys-apps/shadow/Manifest +++ b/sys-apps/shadow/Manifest @@ -169,10 +169,10 @@ AUX shadow-4.0.15-no-default-MAIL.patch 879 RMD160 c380e0a00ef0be8a99927de8bb6cf MD5 3ce54cb32b7564df1386544bf3d1e035 files/shadow-4.0.15-no-default-MAIL.patch 879 RMD160 c380e0a00ef0be8a99927de8bb6cf70f1dfd33ce files/shadow-4.0.15-no-default-MAIL.patch 879 SHA256 57aa93bae1cbaffc51250bc415384991992e6ebb6cc5bb1f3c0dc90bb3dd0354 files/shadow-4.0.15-no-default-MAIL.patch 879 -AUX shadow-4.0.15-uclibc-missing-l64a.patch 721 RMD160 758ef96e1b7207c6b1d9f7fe7c14664f91e9d78f SHA1 c8448eecbb1a40d008762b5afc12ed44fc548a84 SHA256 ab5f5d679f03b6fa5747c01f11667ac9a7977408284d537623546dadfc713161 size 721 -MD5 088c76f8f851fadad0f6b50ad65610f5 files/shadow-4.0.15-uclibc-missing-l64a.patch 721 -RMD160 758ef96e1b7207c6b1d9f7fe7c14664f91e9d78f files/shadow-4.0.15-uclibc-missing-l64a.patch 721 -SHA256 ab5f5d679f03b6fa5747c01f11667ac9a7977408284d537623546dadfc713161 files/shadow-4.0.15-uclibc-missing-l64a.patch 721 +AUX shadow-4.0.15-uclibc-missing-l64a.patch 1354 RMD160 6d35c4ddad876edacdd41be056fa8abd567ae802 SHA1 27012d25d41a19dcafab1fb45921bbf7aa12885d SHA256 37ac2cdea64f849e0cf9e92ccefeab05b0466541268fb4844f18a94c377c8514 size 1354 +MD5 f79f1051bedb185f81f24fb9d30dcc35 files/shadow-4.0.15-uclibc-missing-l64a.patch 1354 +RMD160 6d35c4ddad876edacdd41be056fa8abd567ae802 files/shadow-4.0.15-uclibc-missing-l64a.patch 1354 +SHA256 37ac2cdea64f849e0cf9e92ccefeab05b0466541268fb4844f18a94c377c8514 files/shadow-4.0.15-uclibc-missing-l64a.patch 1354 AUX shadow-4.0.4.1-nonis.patch 1504 RMD160 f8e5fc3fb33c2d57206d813e88abe6a7d6198ed7 SHA1 2f05f7dcd62248c974b58909c8951a7eeb64f7a4 SHA256 3e126ef9e1e9b7d95297e2e1dd450557438f9a7f13a120fae8863e3d80534e08 size 1504 MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504 RMD160 f8e5fc3fb33c2d57206d813e88abe6a7d6198ed7 files/shadow-4.0.4.1-nonis.patch 1504 @@ -312,7 +312,7 @@ SHA256 6945583c30661308f30bd36bf7e5e64c0b923a06914def8622b702b447daf849 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEYAYx2+ySkm8kpY0RAoIFAKCaXQ22RYELVl48BIay6G0UY4IHSACff77e -YjfcHlFz0TXgtKiYHNrUFic= -=D2vv +iD8DBQFEZ0m62+ySkm8kpY0RAhobAKCL4w4mREAN4kwsTZVaJZj61c/nOwCgwFcN +vhnDXwkXLCJBVtBlcIIzoDI= +=2znc -----END PGP SIGNATURE----- diff --git a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch index 3adf1b8f90e8..ac9aa8c9dfd4 100644 --- a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch +++ b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch @@ -2,7 +2,7 @@ uClibc svn has l64a() support in it, but not uClibc 0.9.28 release --- shadow-4.0.15/libmisc/salt.c +++ shadow-4.0.15/libmisc/salt.c -@@ -14,6 +14,32 @@ +@@ -14,6 +14,52 @@ #include "prototypes.h" #include "defines.h" #include "getdef.h" @@ -13,21 +13,41 @@ uClibc svn has l64a() support in it, but not uClibc 0.9.28 release + * l64a - convert a long to a string of radix 64 characters + */ + ++static const char conv_table[64] = ++{ ++ '.', '/', '0', '1', '2', '3', '4', '5', ++ '6', '7', '8', '9', 'A', 'B', 'C', 'D', ++ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', ++ 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', ++ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', ++ 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', ++ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', ++ 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' ++}; ++ +char * -+l64a(long l) ++l64a (n) ++ long int n; +{ -+ static char buf[8]; -+ int i = 0; ++ unsigned long int m = (unsigned long int) n; ++ static char result[7]; ++ int cnt; ++ ++ /* The standard says that only 32 bits are used. */ ++ m &= 0xffffffff; + -+ if (l < 0L) -+ return ((char *) 0); ++ if (m == 0ul) ++ /* The value for N == 0 is defined to be the empty string. */ ++ return (char *) ""; + -+ do { -+ buf[i++] = i64c ((int) (l % 64)); -+ buf[i] = '\0'; -+ } while (l /= 64L, l > 0 && i < 6); ++ for (cnt = 0; m > 0ul; ++cnt) ++ { ++ result[cnt] = conv_table[m & 0x3f]; ++ m >>= 6; ++ } ++ result[cnt] = '\0'; + -+ return (buf); ++ return result; +} + +#endif /* !HAVE_A64L */ |