aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2009-05-17 15:12:29 +0000
committerJason Woodward2009-05-17 15:12:29 +0000
commitfda93869675f60879f78b251a8a8a5891d2e0998 (patch)
tree1da5aeb999e2e57c61267877072805f578ac3503
parent6bfc95089e05e3e362854c625b084eda7e6af4ed (diff)
downloadslapt-get-fda93869675f60879f78b251a8a8a5891d2e0998.tar.gz
fixed handling of a plus sign in package location (path) in MD5 (Ondrej Zary)
-rw-r--r--ChangeLog4
-rw-r--r--src/package.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 82628c8..e6ec8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
-0.10.1b Apr 28, 2009
+0.10.1b May 17, 2009
+ * fixed handling of a plus sign in package location (path) in MD5
+ (Ondrej Zary)
* fixed small issues in FAQ#17 script
0.10.1a Apr 28, 2009
diff --git a/src/package.h b/src/package.h
index cb5e805..10a32d8 100644
--- a/src/package.h
+++ b/src/package.h
@@ -14,7 +14,7 @@
#define SLAPT_ROOT_ENV_NAME "ROOT"
#define SLAPT_ROOT_ENV_LEN 255
#define SLAPT_PKG_LOG_PATTERN "^(.*{1,})\\-(.*[\\-].*[\\-].*)"
-#define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+$"
+#define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._+\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+$"
#define SLAPT_REQUIRED_REGEX "^[ ]{0,}([^ ]{1,})[ ]{0,}([\\<\\=\\>]+){0,}[ ]{0,}([a-zA-Z0-9\\.\\_\\-]+){0,}[ ]{0,}$"
#define SLAPT_MD5_STR_LEN 33
#define SLAPT_PKG_LIST "PACKAGES.TXT"