aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9>2009-08-11 20:16:27 +0000
committerrhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9>2009-08-11 20:16:27 +0000
commita839abbf21e7837edc274b478ce9afff9b2ec337 (patch)
tree65ccb67c119719a66c4114b05972208bd176ccfb
parentbcffcf3f390febfb5f63764e86daa1f3217c3753 (diff)
downloadmkbuilds-a839abbf21e7837edc274b478ce9afff9b2ec337.tar.gz
mkbuilds-a839abbf21e7837edc274b478ce9afff9b2ec337.tar.bz2
apg: enhancing patch to fix gentoo bug #155526
git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@503 18ef50b8-d735-4ccd-97c1-689132df3dd9
-rw-r--r--app/admin/apg/Manifest32
-rw-r--r--app/admin/apg/apg-2.3.0b.diff35
-rw-r--r--app/admin/apg/apg.mkbuild2
3 files changed, 51 insertions, 18 deletions
diff --git a/app/admin/apg/Manifest b/app/admin/apg/Manifest
index d29f342..0de8ba0 100644
--- a/app/admin/apg/Manifest
+++ b/app/admin/apg/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
DIST apg-2.2.3.tar.gz 108186 MD5 3b3fc4f11e90635519fe627c1137c9ac RMD160 ccc1d8a90fcac90717a9ee16fcc85de53d5ef90d SHA1 7bdbc931ef8477717186dc3ab3a2d3c25012b4ca SHA256 69c9facde63958ad0a7630055f34d753901733d55ee759d08845a4eda2ba7dba SHA512 d2479dc2cb5d571ddea23d98e9d4ddbdfff874013ff27c00073a3231c4c1d0ee9b75d3983331f3513755b57527766cc5a35e6829cdca15d2e9293dfbc4c2788a
DIST apg-2.3.0b.tar.gz 109995 MD5 bd82400a5a731070ce895313576afe24 RMD160 18f9955d6fdb721bec26613860b312d7fea6fba7 SHA1 d729c939adb659c05fd0ea3d9c03842c6fe86fed SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
-MKBUILD apg.mkbuild 4824 MD5 564531eca2616fc3ce22e656841cb6f4 RMD160 6b262bdfd330f01386869e3bf5ac27cd482ad3ea SHA1 2288a8d8d9b8613923c12c230edd29acd28d6940 SHA256 f9ace49664b82f1b3edecbf55c7fd4f5edeeb9d95106d70ae9257a1e172957d6 SHA512 cc47ef0cba123a170fd5e8bd8f3196abc08e631b750a3a3e112fb9a20bbe38deaac1b035dd61c981f6e25f18a34ae5d342b636dd6fb858fdf052458a13a40450
+MKBUILD apg.mkbuild 4825 MD5 c6e1806b5d41d00e062415d382cb8ddb RMD160 cd1548a57ba752130f734410ceaaee747bbcd0cd SHA1 7d397181e7a27b1702f0b43cfe461688114fb9d9 SHA256 08253c5c730e459f49fbb1842bbcfe0ae746ac5f917a1bcf0b01bfa18b4e447d SHA512 a6624afedf3071aa27eb3d0b66bce366b5d35cb3369b649ed16899fe8589e53fe59671c05bdbc99d1b2f9982c189b4fe19f8e651836a71fefcce86f9cca5dff9
PATCH apg-2.2.3.diff 2109 MD5 ec67d7c811f7368f206a426e7fb5954a RMD160 a859241058276d5ee49a293108ae98c7d6a5b6ac SHA1 de29b2140db74c4af2da403654be8946bce94034 SHA256 1b47bc6a08f697c34743fd96afd6b07b27494ecafbbd1473bc618839c82a9623 SHA512 876838282fa76d3675994c464851d11e8469fd92a23adc4c89715464f0e15507fa13e44084b7ac17d3228dc4213fe98d59b44e3f687a42b075f7a2f051c7cd84
-PATCH apg-2.3.0b.diff 2341 MD5 612185c62bfdd37f6fb6398f391709fa RMD160 573e62d92c4c119ebcf1865e4ad527a08c743bda SHA1 adfb47b79a2f774aea7445c1814dd87aa013457b SHA256 50efb4689d23f20e9e310ffd4168b9c896c67e9dca0c8b458b377e4705d382c5 SHA512 1b29a1b21a868724052877ca5d3e34f68c0a5ade01632463a3a801ac9412b70cb8c646a16271a1d5828e81f2cdf73aa4e8c5c7fe78cba73696bcdfd4a1aaa866
-SLACKBUILD apg.SlackBuild 7587 MD5 75cef7cda66e0752fb1982ee7ec5bedb RMD160 3db04f4c7d3ed92c1e258d8a0f8bfab6ae2a9bb9 SHA1 dff8dd37d68976f85f26925350f3bf6da2173679 SHA256 87023ee21367048509c43855cf80c70df855e3b128cacd70139edab3193a09b8 SHA512 3f90f11344eee02d2c975d059a0f392a394923ff26f1f74d3c359d51ec1b300773b0bf08c40627d1029d432ba5228711c9e21ac772bcf69a0f220d03a3d8b904
+PATCH apg-2.3.0b.diff 3341 MD5 3d12b7e0714a055c6e335e7461ea8c10 RMD160 ade31f4eb1641039b6190f325c1cf813c7c29f38 SHA1 5b7c2ff7a4ff9b8acbd14f1d9522edb443dbd430 SHA256 f3e931852f9e18207ce93a7e84b2d23a61111f7a5497b2f6898fed846bbadd10 SHA512 a37450bfbca06e1dcd2caa19e3de22f4783497c9f4f32effa1b5f0bb973f8d3f0faca9dea78dc27433b50830f0619f80d9aff45247850e7eb46d7146780d8941
+SLACKBUILD apg.SlackBuild 7587 MD5 230bdb87f43c6214e92248fc3000132b RMD160 bfd2c8632c00d83bee85790d4a3559cb4b3b3dbf SHA1 41d73ae33da6764f5c3ea79acb76759f5c7b2b4c SHA256 aea150d4ca06d1c6a76580ce55bc7aaeec39459ecb638b5db02b137d85d92c71 SHA512 b9007cd0c918ed300ad7ae4adee7ffe68248d08c4d236bdd549e593d0aa97318f5138c58c1ac37b25181e1427143feb8e3f7ff5510853e4d72a1612d672f0ff4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iQIcBAEBCAAGBQJKQZpsAAoJEEHL93ESzgeih/AQALL97pSx9LAMz6uOCYdlKKHK
-5Qt7XKxtCnQm96mXdLuzlo8GIhFrUHevCsB3peWh2jDJIkGkwXorVtr5Yk5t3Uv8
-v9uzC0afqjN5zDnB6gT7oO7kOz8Kiq5X79YpiymPdJ0uh86/uSBBaS6i6lE8c3pi
-UP01SEquTxUNAv1gSyroLbo/h+UBRf9zzNG+HLQ4QLDNY2Rhz3g37eAPhLXcM2N+
-H1THNs+mkrVq6jcKhIv/30s6GnpyMEp1GyZLOmge5EU3SqsbOs2RDgjuegJQk/Yp
-oqPnv0hi1K1GU+y13Q99Z+WGmJVIpugYbWYFLWjxWF5pkyosXJSQLGdHuzd+4PZI
-L5jnNMdNbVt7C/pjwWs5Pu33iUF5fOFI7VLYfmw2nodYskUmmf9hbDdJZtY1nVgZ
-ikoRCik04kyn57nf1p8b2OfD/+LcDAr8mHYj7wFNmOv13L00IydRcaSP7rm3vw/5
-l5hNmzD94wGo40Xwk+nFmqzuO0eVnepMA2YtQyD2E4U3EpFkfqdhU6F/Udanbavd
-hlOts/TXNqWHC00owQ7WfKWa4wW9UN3nDW0e5IW66DjXmD8BTN+pLZEjUjncZQqf
-ecr+z+MbY4f7zDeW9oaz1jLp6DqGNg8+QgN3vuzWqzjjI954yRl33lp3SvW8VLBJ
-1kOw6gm4OnvZ5VmzxWe7
-=QZTF
+iQIcBAEBCAAGBQJKgdFsAAoJEEHL93ESzgeikC8QALFjsH8bBDElXYoAbztC4Mr/
+0o6wD1huGdsmxMPrKy+pkAGxjXzekREtQGPIKhziDW0zezDjHSPrgDztklqzjO0K
+iF2HJkAYQVO/o9bTbziNQ5w0kYi519mymXSkTWzLM/M6YdYoHIuuySrgaPgIJt9I
+I2ia5ZWKhzrFsKVkuqoYZSm0xjMPXehchHb6zATfsaF7e4hlOAn/LARIROoWQEoM
+gdzuCNwFKQvPIoPkzpgZ1lHQzyUdmPInRl8ofQS4VGf8c+Srs0GohPhu7pAOjNRr
+ACr8G+UlGf6bTx2AdeILRBM2PkR3FY7+r9q/30+DRnFfaf/Y7qXbvqtiTKow0oKP
+sQCc2MScu61WY1YDnm29gYQ14x/8zVeV0Z06rQ9Js58uFxqxBBKybkHiB+LclMGY
+rHD+Hvpj88NAJzlECMp4aTlQarEB5OypJc0mLKAScwXnLqJdK4dqjBFsJcCRvBzs
+LXNXqeJ7ki9hQ9QMOjjzwSGkC2kYYiZS6yOaWFTuHuafJ1L925hHRZ/8ii5f8Go/
+A/jOq7NYyw0yskd0d52CqOJPvrGhn4BZpQ/um6j8s+NwwAkFRiCp+FKcOhS6u1DL
+HVmdtdX6dz7uKAoLZZoNbPIHC2mMUxHWesj1K9Qao6P0vhXetjwmUtHOhaa1S8kw
+x2Fkqn76648qH5C8ytnh
+=/lNR
-----END PGP SIGNATURE-----
diff --git a/app/admin/apg/apg-2.3.0b.diff b/app/admin/apg/apg-2.3.0b.diff
index ee659c9..05e85eb 100644
--- a/app/admin/apg/apg-2.3.0b.diff
+++ b/app/admin/apg/apg-2.3.0b.diff
@@ -1,6 +1,6 @@
diff -Naur apg-2.3.0b.orig/Makefile apg-2.3.0b/Makefile
--- apg-2.3.0b.orig/Makefile 2003-08-07 12:40:39.000000000 -0300
-+++ apg-2.3.0b/Makefile 2009-06-24 00:12:27.000000000 -0300
++++ apg-2.3.0b/Makefile 2009-08-11 17:13:18.000000000 -0300
@@ -1,7 +1,7 @@
##################################################################
# Directories
@@ -45,3 +45,36 @@ diff -Naur apg-2.3.0b.orig/Makefile apg-2.3.0b/Makefile
fi
install-cygwin:
+diff -Naur apg-2.3.0b.orig/apg.c apg-2.3.0b/apg.c
+--- apg-2.3.0b.orig/apg.c 2003-08-07 12:40:39.000000000 -0300
++++ apg-2.3.0b/apg.c 2009-08-11 17:14:03.000000000 -0300
+@@ -100,6 +100,7 @@
+ #else /* CLISERV */
+ #if defined(APG_USE_CRACKLIB)
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vkt"
++#include <crack.h>
+ #else /* CRACKLIB */
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vt"
+ #endif /* CRACKLIB */
+@@ -709,7 +710,7 @@
+ */
+ char * crypt_passstring (const char *p)
+ {
+- char salt[10];
++ char salt[11];
+ gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
+ return (crypt(p, salt));
+ }
+diff -Naur apg-2.3.0b.orig/restrict.c apg-2.3.0b/restrict.c
+--- apg-2.3.0b.orig/restrict.c 2003-08-07 12:40:39.000000000 -0300
++++ apg-2.3.0b/restrict.c 2009-08-11 17:14:03.000000000 -0300
+@@ -33,6 +33,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(APG_USE_CRACKLIB)
++#include <crack.h>
++#endif /* APG_USE_CRACKLIB */
+ #include "restrict.h"
+ extern struct sym smbl[94];
+ /*
diff --git a/app/admin/apg/apg.mkbuild b/app/admin/apg/apg.mkbuild
index e1034d4..f227217 100644
--- a/app/admin/apg/apg.mkbuild
+++ b/app/admin/apg/apg.mkbuild
@@ -56,7 +56,7 @@
#
# Build number.
# Auto-set to default 1
-[[BUILD NUMBER]]=""
+[[BUILD NUMBER]]="2"
#
# Source Name construction string