# Note: GNUmakefile is built automatically from GNUmakefile.in
#
-# Written by and Copyright (C) 2001-2018 members of the
+# Written by and Copyright (C) 2001-2021 members of the
# Privoxy team. https://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
@SET_MAKE@
#############################################################################
-# Version number (for RPM)
+# Version number
#############################################################################
VERSION_MAJOR = @VERSION_MAJOR@
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT)
SNAPVERSION = $(VERSION)-$(shell date "+%Y%m%d")
-SOURCE_DATE_EPOCH = @SOURCE_DATE_EPOCH@
+SOURCE_DATE_EPOCH ?= @SOURCE_DATE_EPOCH@
MTREE_SPEC_FILE = privoxy-$(VERSION)-$(CODE_STATUS).spec
#############################################################################
CONF_BASE = @sysconfdir@
SBIN_DEST = @sbindir@
MAN_DIR = @mandir@
-MAN_DEST = $(MAN_DIR)/man1
-MAN_PAGE = privoxy.1
+MAN_DEST = $(MAN_DIR)/man8
+MAN_PAGE = privoxy.8
SHARE_DEST = @datadir@
DOC_DEST = $(SHARE_DEST)/doc/privoxy
VAR_DEST = @localstatedir@
W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32
W32_INIS = @WIN_ONLY@config.txt trust.txt
-SSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY@ssl.c
+SSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY@ssl_common.c
SSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.o)
SSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.h) project.h
+MBEDTLS_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@ssl.c
+MBEDTLS_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.o)
+MBEDTLS_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.h)
+
+OPENSSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@openssl.c
+OPENSSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.o)
+OPENSSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.h)
+
PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c
PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@)
PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h)
-PCRE_SRC = @STATIC_PCRE_ONLY@pcre/get.c pcre/maketables.c pcre/study.c pcre/pcre.c
-PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:.c=.@OBJEXT@)
-PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h pcre/pcre.h
-
# No REGEX (maybe because dynamically linked pcreposix):
REGEX_SRC =
-@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
REGEX_OBJS = $(REGEX_SRC:.c=.@OBJEXT@)
REGEX_HDRS = $(REGEX_SRC:.c=.h)
# Dependencies introduced by #include "project.h".
-PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS) @STATIC_PCRE_ONLY@pcre/pcre.h
+PROJECT_H_DEPS = project.h $(REGEX_HDRS) $(PCRS_HDRS)
# Socket libraries for platforms that need them explicitly defined
SOCKET_LIB = @SOCKET_LIB@
# PThreads library, if needed.
PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@
-SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(SSL_SRC)
-OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS)
-HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS)
+SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(REGEX_SRC) $(SSL_SRC) $(MBEDTLS_SRC) $(OPENSSL_SRC)
+OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(REGEX_OBJS) $(SSL_OBJS) $(MBEDTLS_OBJS) $(OPENSSL_OBJS)
+HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(REGEX_HDRS) $(SSL_HDRS) $(MBEDTLS_HDRS) $(OPENSSL_HDRS)
LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB)
# Add your flags here
OTHER_CFLAGS =
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
- @STATIC_PCRE_ONLY@ -Ipcre
+CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall
LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
- -name "PACKAGERS" -o -path "*.git/*" \) | sort`; do \
+ -name "PACKAGERS" -o -path "*.git/*" \
+ -o -path "*/doc/webserver/feeds*" \) | sort`; do \
files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \
done && \
cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \
$(ECHO) "#mtree 2.0" > $(MTREE_SPEC_FILE)
for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \
-o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \
- -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \) | env -i sort`; do \
+ -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \
+ -o -path "*/doc/webserver/feeds*" \) | env -i sort`; do \
$(ECHO) "privoxy-$(VERSION)-$(CODE_STATUS)/$$i time=$(SOURCE_DATE_EPOCH) type=file uname=privoxy gname=privoxy mode=0555"; \
done >> $(MTREE_SPEC_FILE)
$(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)
dok-readme: dok-release
cd doc/source && $(DB_TXT)-notoc -V nochunks readme.sgml > tmp.html &&\
$(W3M_DUMP) tmp.html > ../../README ;\
+ $(PERL) -pi'' -e 's@doc/source/readme\.sgml@README@' ../../README; \
$(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\
$(W3M_DUMP) tmp.html > ../../INSTALL ;\
$(RM) tmp.*
s/<\/HEAD/\n<meta name=\"description\" content=\"Privoxy helps users to protect their privacy.\"><\/HEAD/;\
s/\.\d\. //;\
s/__copy/©/;\
- s@(<SUB)@<p style="text-align: center">\1@; s@(</SUB)@\1></p@' \
+ s@(<SUB)@<p style="text-align: center">\1@; s@(</SUB)@\1></p@;\
+ s@(Privoxy is a non-caching)@<img src="images/privoxy.png" align="right" alt="Privoxy logo">\n\1@; \
+ s@www.lalal.ai@<a href="https://www.lalal.ai/"><img src="images/sponsors/lalal.ai_logo.png" align="middle" alt="Vocal Remover by Lalal.ai"></a>\n@;' \
doc/webserver/index.html && $(RM) doc/webserver/*.bak
# privoxy-index.html for local documentation:
urlmatch.@OBJEXT@: urlmatch.c urlmatch.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
client-tags.@OBJEXT@: client-tags.c client-tags.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
fuzz.@OBJEXT@: fuzz.c config.h $(PROJECT_H_DEPS) errlog.h miscutil.h ssplit.h
-ssl.@OBJEXT@: ssl.c ssl.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h
-
-# GNU regex
-gnu_regex.@OBJEXT@: gnu_regex.c gnu_regex.h config.h
+ssl.@OBJEXT@: ssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h
+openssl.@OBJEXT@: openssl.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) encode.h errlog.h jcc.h miscutil.h
+ssl_common.@OBJEXT@: ssl_common.c ssl.h ssl_common.h config.h $(PROJECT_H_DEPS) errlog.h miscutil.h
# PCRS
-pcrs.@OBJEXT@: pcrs.c pcrs.h config.h @STATIC_PCRE_ONLY@pcre/pcre.h
-
-# PCRE
-pcre/get.@OBJEXT@: pcre/get.c pcre/config.h pcre/internal.h pcre/pcre.h
-pcre/maketables.@OBJEXT@: pcre/maketables.c pcre/config.h pcre/internal.h pcre/pcre.h
-pcre/pcre.@OBJEXT@: pcre/pcre.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/chartables.c
-pcre/pcreposix.@OBJEXT@: pcre/pcreposix.c pcre/config.h pcre/internal.h pcre/pcre.h pcre/pcreposix.h
-pcre/study.@OBJEXT@: pcre/study.c pcre/config.h pcre/internal.h pcre/pcre.h
-
-# An auxiliary program makes the PCRE default character table source
-
-pcre/chartables.c: pcre/dftables@EXEEXT@
- pcre/dftables@EXEEXT@ >pcre/chartables.c
-
-pcre/dftables@EXEEXT@: pcre/dftables.c pcre/maketables.c pcre/pcre.h pcre/internal.h pcre/config.h
- $(CC) -o pcre/dftables@EXEEXT@ $(CFLAGS) pcre/dftables.c
+pcrs.@OBJEXT@: pcrs.c pcrs.h config.h
# Win32
-w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h w32taskbar.h win32.h
+w32log.@OBJEXT@: w32log.c errlog.h config.h jcc.h loadcfg.h miscutil.h pcrs.h project.h w32log.h w32taskbar.h win32.h
w32taskbar.@OBJEXT@: w32taskbar.c config.h w32log.h w32taskbar.h
-win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcre/pcre.h pcre/pcreposix.h pcrs.h project.h w32log.h win32.h w32svrapi.h
+win32.@OBJEXT@: win32.c config.h jcc.h loadcfg.h pcrs.h project.h w32log.h win32.h w32svrapi.h
w32.res: w32.rc w32res.h icons/radar-01.ico icons/radar-02.ico icons/radar-03.ico icons/radar-04.ico icons/radar-05.ico icons/radar-06.ico icons/radar-07.ico icons/radar-08.ico icons/idle.ico icons/privoxy.ico config.h
windres -F pe-i386 -D__MINGW32__=0.2 -O coff -i $< -o $@
$(RM) a.out $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) default.action \
config.base config.tmp \
`find . \( -name TAGS -o -name tags \) -a -not -path "./.git/*"` \
- `find . -name "*.orig" -a -not -name rc.privoxy.orig -a -not -path "./.git/*"`
+ `find . -name "*.orig" -a -not -path "./.git/*"`
clean-editor-files:
$(RM) `find . -name "*~"`
clobber: clean-editor-files
$(RM) GNUmakefile configure config.h.in config.h config.cache config.status config.log logfile \
- privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl config.new
+ privoxy.log core *.tar.gz *.tar privoxy-cl.spec doc/source/ldp.dsl
$(RM) -r autom4te.cache
#
DOC=$(prefix)/doc/privoxy ;\
fi;\
$(MKDIR) $(DESTDIR)$$DOC $(DESTDIR)$$DOC/user-manual $(DESTDIR)$$DOC/faq $(DESTDIR)$$DOC/developer-manual \
- $(DESTDIR)$$DOC/man-page $(DESTDIR)$$DOC/images $(DESTDIR)$(MAN_DEST) ;\
+ $(DESTDIR)$$DOC/man-page $(DESTDIR)$(MAN_DEST) ;\
if [ -d "$(DOK_WEB)" ]; then \
$(ECHO) Installing FAQ, Manual, and other docs to $(DESTDIR)$$DOC;\
for i in user-manual developer-manual faq; do \
$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
$(ECHO) Installing fresh $$i;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+ elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
$(ECHO) Installing $$i as $$i.new ;\
$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
NEW=1;\
$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
- $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
+ $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \
$(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \
$(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \
$(SED) 's+%USER%+$(USER)+' | \
$(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
$(INSTALL) $(INSTALL_P) slackware/rc.privoxy $(DESTDIR)/etc/rc.d/ ;\
$(ECHO) "Installing for Slackware." ;\
- $(ECHO) "Dont forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\
+ $(ECHO) "Don't forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\
elif [ -d $(DESTDIR)/etc/init.d ] && [ -w $(DESTDIR)/etc/init.d ] ; then \
$(ECHO) "Installing generic init script to $(DESTDIR)/etc/init.d/privoxy" ;\
$(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
uninstall: CONF_DEST LOG_DEST PID_DEST check_doc
@$(ECHO) Starting Privoxy uninstallation
@# KILL privoxy if running
- @# XXX: the chkconfig line may need a DESTDIR prefix.
-@test -f $(DESTDIR)$(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
$(KILL) `$(CAT) $(DESTDIR)$(PID_DEST)/privoxy.pid` || :
-@test -f $(DESTDIR)/var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\
done ;\
fi
@$(ECHO) Removing $(PROGRAM) config files
- -@for i in $(DESTDIR)$(CONFIGS); do \
- test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\
+ -@for i in $(CONFIGS); do \
+ test -f $(DESTDIR)$(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\
$(RM) $(DESTDIR)$(CONF_DEST)/$$i $(DESTDIR)$(CONF_DEST)/$$i~ $(DESTDIR)$(CONF_DEST)/$$i.new ;\
done
-@test -d $(DESTDIR)$(CONF_DEST)/templates && $(RM) -r $(DESTDIR)$(CONF_DEST)/templates &&\