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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
$NetBSD: patch-am,v 1.3.8.1 2005/06/05 18:35:25 salo Exp $
--- popper/Makefile.in.orig 2005-05-13 20:20:11.000000000 +0100
+++ popper/Makefile.in
@@ -96,6 +96,8 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
installdir = @sbindir@
+libexecdir = @libexecdir@
+sbindir = @sbindir@
popper_srcdir = ${top_srcdir}/popper
qd_srcdir = ${top_srcdir}/qd
@@ -114,17 +116,20 @@ password_dir = ${base_dir}/password
OBJS = pop_dele.o pop_dropcopy.o \
- pop_get_command.o pop_get_subcommand.o pop_init.o \
+ pop_get_command.o pop_get_subcommand.o \
pop_last.o pop_list.o pop_log.o pop_lower.o \
pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
pop_rset.o pop_send.o pop_stat.o pop_updt.o \
pop_user.o pop_xtnd.o pop_xmit.o popper.o \
- pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o \
+ pop_bull.o xtnd_xlst.o pop_uidl.o \
pop_rpop.o pop_apop.o md5.o pop_auth.o pop_pope.o \
pop_extend.o scram.o hmac.o base64.o pop_util.o \
get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \
pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \
- main.o pop_cache.o genpath.o
+ pop_cache.o genpath.o
+
+INETDOBJ = main.o pop_init.o
+STANDOBJ = main-stand.o pop_init-stand.o
SRCS = pop_dele.c pop_dropcopy.c \
pop_get_command.c pop_get_subcommand.c pop_init.c \
@@ -132,7 +137,7 @@ SRCS = pop_dele.c pop_dropc
pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
pop_rset.c pop_send.c pop_stat.c pop_updt.c \
pop_user.c pop_xtnd.c pop_xmit.c popper.c \
- pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c \
+ pop_bull.c xtnd_xlst.c pop_uidl.c \
pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
pop_extend.c scram.c hmac.c base64.c pop_util.c \
get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
@@ -181,7 +186,7 @@ USE_PAM = @USE_PAM@
.SUFFIXES: .c .o
-all: popper ${pop_auth} mangler_library common_library ${poppassd}
+all: mangler_library common_library popper popper-standalone ${pop_auth} ${poppassd}
mangler_library:
cd ${mmangle_dir} && ${MAKE} all
@@ -189,13 +194,18 @@ mangler_library:
common_library:
cd ${common_dir} && ${MAKE} all
-popper: ${OBJS} mangler_library common_library
- ${CC} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
+popper: ${INETDOBJ} ${OBJS} mangler_library common_library
+ ${CC} ${INETDOBJ} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
-I${common_srcdir} ${common_dir}/libcommon.a \
${LIBS} ${LDFLAGS}
+popper-standalone: ${STANDOBJ} ${OBJS} mangler_library common_library
+ ${CC} ${STANDOBJ} ${OBJS} -o popper-standalone \
+ ${mmangle_dir}/libmangle.a -I${common_srcdir} \
+ ${common_dir}/libcommon.a ${LIBS}
+
popauth: ${POPAUTHOBJS}
- ${CC} -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
+ ${CC} -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} ${DBM_LIBS} \
${common_dir}/libcommon.a
poppassd: common_library
@@ -206,22 +216,36 @@ poppassd: common_library
-I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
+main-stand.o: main.c
+ ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
+ -o $@ main.c
+
+pop_init-stand.o: pop_init.c
+ ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
+ -o $@ pop_init.c
+
${SRCS}:
${POPAUTHSRCS}:
-install: popper ${pop_auth}
- ${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
- echo "Installed popper as ${installdir}/popper"
- if [ "x${poppassd}" != "x" ]; then \
- cd ${password_dir} && ${MAKE} $@ ;\
+install: popper popper-standalone ${pop_auth}
+ ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
+ echo "Installed popper as ${libexecdir}/qpopper"
+ ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper
+ @echo "Installed standalone popper as ${sbindir}/qpopper"
+ @if [ "x${pop_auth}" != "x" ]; then \
+ ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \
+ ${sbindir}/q${pop_auth}; \
+ echo "Installed popauth as ${sbindir}/q${pop_auth} " \
+ "with uid ${apop_uid}"; \
+ ${sbindir}/q${pop_auth} -init -safe; \
fi
- if [ "x${pop_auth}" != "x" ]; then \
- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
- ${installdir}/${pop_auth}; \
- echo "Installed popauth as ${installdir}/${pop_auth} " \
- "with uid ${apop_uid}"; \
- ${installdir}/${pop_auth} -init -safe; \
+ if [ "x${poppassd}" != "x" ]; then \
+ cd ${password_dir} && ${MAKE} $@ ;\
fi
if [ "x${USE_PAM}" != "x" ]; then \
|
