1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
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-08-11 17:13:18.000000000 -0300
@@ -1,7 +1,7 @@
##################################################################
# Directories
# Install dirs
-INSTALL_PREFIX = /usr/local
+INSTALL_PREFIX = /usr
# Full default path is /usr/local/bin
APG_BIN_DIR = /bin
@@ -144,22 +144,22 @@
install:
if test -x ./apg; then \
-./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
-./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
-./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APG_BIN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APG_MAN_DIR}; \
+./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${DESTDIR}/${INSTALL_PREFIX}${APG_BIN_DIR}; \
+./install-sh -c -m 0444 ./doc/man/apg.1 ${DESTDIR}/${INSTALL_PREFIX}${APG_MAN_DIR}; \
fi
if test -x ./apgd; then \
-./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
-./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
-./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APGD_MAN_DIR}; \
+./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${DESTDIR}/${INSTALL_PREFIX}${APGD_BIN_DIR}; \
+./install-sh -c -m 0444 ./doc/man/apgd.8 ${DESTDIR}/${INSTALL_PREFIX}${APGD_MAN_DIR}; \
fi
if test -x ./apgbfm; then \
-./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
-./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
-./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
-./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APG_BIN_DIR}; \
+./mkinstalldirs ${DESTDIR}/${INSTALL_PREFIX}${APG_MAN_DIR}; \
+./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${DESTDIR}/${INSTALL_PREFIX}${APG_BIN_DIR}; \
+./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${DESTDIR}/${INSTALL_PREFIX}${APG_MAN_DIR}; \
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];
/*
|
