free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuild exim from patch

This commit is contained in:
Bob Mottram 2018-03-28 12:34:17 +01:00
parent ac2116b67b
commit 94261c874e
3 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-app-xmpp
View File

@ -619,6 +619,7 @@ function remove_xmpp {
remove_onion_service xmpp 5222 5223 5269 remove_onion_service xmpp 5222 5223 5269
sed -i '/HiddenServiceVersion 2/d' /etc/tor/torrc sed -i '/HiddenServiceVersion 2/d' /etc/tor/torrc
apt-mark -q unhold prosody
apt-get -yq remove --purge prosody apt-get -yq remove --purge prosody
rm /etc/cron.daily/prosody rm /etc/cron.daily/prosody
if [ -f "$INSTALL_DIR/$prosody_modules_filename" ]; then if [ -f "$INSTALL_DIR/$prosody_modules_filename" ]; then

67
src/freedombone-base-email
View File

@ -83,10 +83,67 @@ function rebuild_exim_with_socks {
apt-get source exim4-daemon-heavy apt-get source exim4-daemon-heavy
apt-get -qy build-dep exim4-daemon-heavy apt-get -qy build-dep exim4-daemon-heavy
cd "${INSTALL_DIR}/exim4/exim4-*" || exit 356835685 cd "${INSTALL_DIR}/exim4/exim4-*" || exit 356835685
cp src/EDITME Local/Makefile
sed -i 's|# SUPPORT_SOCKS|SUPPORT_SOCKS|g' Local/Makefile { echo 'Description: Socks proxying';
# TODO how to make this non-interactive echo ' Support for socks proxying of outgoing mail';
EDITOR=nano echo '\C-x' | dpkg-source --commit . SOCKS echo ' This is to support onion email addresses, which require support for SOCKS5';
echo ' .';
echo " exim4 (${exim_version}-2+deb9u3) stretch-security; urgency=high";
echo ' .';
echo ' * Non-maintainer upload by the Security Team.';
echo ' * Fix base64d() buffer size (CVE-2018-6789) (Closes: #890000)';
echo 'Author: Salvatore Bonaccorso <carnil@debian.org>';
echo 'Bug-Debian: https://bugs.debian.org/890000';
echo '';
echo '---';
echo 'The information above should follow the Patch Tagging Guidelines, please';
echo 'checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here';
echo 'are templates for supplementary fields that you might want to add:';
echo '';
echo 'Origin: <vendor|upstream|other>, <url of original patch>';
echo 'Bug: <url in upstream bugtracker>';
echo 'Bug-Debian: https://bugs.debian.org/<bugnumber>';
echo 'Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>';
echo 'Forwarded: <no|not-needed|url proving that it has been forwarded>';
echo 'Reviewed-By: <name and email of someone who approved the patch>';
echo "Last-Update: $(date +%Y-%m-%d)";
echo '';
echo '--- /dev/null';
echo "+++ exim4-${exim_version}/Local/Makefile";
echo '@@ -0,0 +1,32 @@';
echo '+BIN_DIRECTORY=/usr/exim/bin';
echo '+CONFIGURE_FILE=/usr/exim/configure';
echo '+EXIM_USER=';
echo '+SPOOL_DIRECTORY=/var/spool/exim';
echo '+ROUTER_ACCEPT=yes';
echo '+ROUTER_DNSLOOKUP=yes';
echo '+ROUTER_IPLITERAL=yes';
echo '+ROUTER_MANUALROUTE=yes';
echo '+ROUTER_QUERYPROGRAM=yes';
echo '+ROUTER_REDIRECT=yes';
echo '+TRANSPORT_APPENDFILE=yes';
echo '+TRANSPORT_AUTOREPLY=yes';
echo '+TRANSPORT_PIPE=yes';
echo '+TRANSPORT_SMTP=yes';
echo '+LOOKUP_DBM=yes';
echo '+LOOKUP_LSEARCH=yes';
echo '+LOOKUP_DNSDB=yes';
echo '+PCRE_CONFIG=yes';
echo '+EXIM_MONITOR=eximon.bin';
echo '+FIXED_NEVER_USERS=root';
echo '+HEADERS_CHARSET="ISO-8859-1"';
echo '+DLOPEN_LOCAL_SCAN=yes';
echo '+LDFLAGS += -rdynamic';
echo '+CFLAGS += -fvisibility=hidden';
echo '+SYSLOG_LOG_PID=yes';
echo '+EXICYCLOG_MAX=10';
echo '+COMPRESS_COMMAND=/usr/bin/gzip';
echo '+COMPRESS_SUFFIX=gz';
echo '+ZCAT_COMMAND=/usr/bin/zcat';
echo '+SUPPORT_SOCKS=yes';
echo '+SYSTEM_ALIASES_FILE=/etc/aliases';
echo '+EXIM_TMPDIR="/tmp"'; } > debian/patches/SOCKS
debuild -us -uc debuild -us -uc
cd "$INSTALL_DIR/exim4" || exit 3468356 cd "$INSTALL_DIR/exim4" || exit 3468356
mv exim4_${exim_version}-*.deb exim4_${exim_version}_all.deb mv exim4_${exim_version}-*.deb exim4_${exim_version}_all.deb
@ -95,7 +152,9 @@ function rebuild_exim_with_socks {
echo "exim4_${exim_version}_all.deb not found" echo "exim4_${exim_version}_all.deb not found"
exit 63857368 exit 63857368
fi fi
apt-mark -q unhold exim4
dpkg -i exim4_${exim_version}_all.deb dpkg -i exim4_${exim_version}_all.deb
apt-mark -q hold exim4
apt-get -yq remove --purge at apt-get -yq remove --purge at
} }

1
src/freedombone-utils-nodejs
View File

@ -78,6 +78,7 @@ function mesh_install_nodejs {
echo "deb https://deb.nodesource.com/node_6.x stretch main" > "$rootdir/etc/apt/sources.list.d/nodesource.list" echo "deb https://deb.nodesource.com/node_6.x stretch main" > "$rootdir/etc/apt/sources.list.d/nodesource.list"
echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> "$rootdir/etc/apt/sources.list.d/nodesource.list" echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> "$rootdir/etc/apt/sources.list.d/nodesource.list"
$mesh_install_nodejs_prefix apt-mark -q unhold nodejs
$mesh_install_nodejs_prefix apt-get update $mesh_install_nodejs_prefix apt-get update
$mesh_install_nodejs_prefix apt-get -yq remove --purge nodejs $mesh_install_nodejs_prefix apt-get -yq remove --purge nodejs