From b74cc787a78b8699c7eba68c66b1e625ed372143 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 12 Jun 2020 13:49:31 +0200 Subject: alpine: add hide-hostname.patch --- alpine/PKGBUILD | 5 ++++- alpine/hide-hostname.patch | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 alpine/hide-hostname.patch diff --git a/alpine/PKGBUILD b/alpine/PKGBUILD index a8206c17..4e8cfc5e 100644 --- a/alpine/PKGBUILD +++ b/alpine/PKGBUILD @@ -4,7 +4,7 @@ pkgname=alpine pkgver=2.22.1.r1.6c120b9 _commit=${pkgver##*.} -pkgrel=1 +pkgrel=2 arch=("i686" "pentium4" "x86_64") pkgdesc="Apache licensed PINE mail user agent" url="http://alpine.freeiz.com" @@ -27,17 +27,20 @@ options=("!makeflags") source=( "alpine::git://repo.or.cz/alpine.git#commit=${_commit}" 'default-pipe.patch' + 'hide-hostname.patch' 'rules.patch' 'topal-patch.patch' ) sha512sums=('SKIP' '15f2143d7fd33b16eedac778aebcff8b89a2c6fdad65e100ad643f397f3d85207c66325975ad73f5189c187d8420f5e7c811e54257c67f97ee69b2ccf50d63e2' + 'fd562fb35c80148ca29d5c57a169afeeba8b3cad9e391ff6923e80d3e706e0aa5c2703571ad2cbc943f76c71e0e891837e3947caa08aed98dc7685bf17c71e2f' 'b6719c245e5539af07d18b14e4e30e47c8ac1fcd91b431de40e8c0968c09707c1476adb1d322567e0683f28923022aed07291781de055298b49e39d897dbec23' 'bdaf9f0ed2bb9d10eaf4b456e24684cd09eb9e97ae2cf6eb4a2bc2bb5e231e8254d79efa63da9918022302fd970180f2dcd90a69d8c8d817c729c6a18fd6d506') prepare() { cd "${srcdir}/${pkgname}" patch -p1 -i "${srcdir}/default-pipe.patch" + patch -p1 -i "${srcdir}/hide-hostname.patch" patch -p1 -i "${srcdir}/rules.patch" patch -p1 -i "${srcdir}/topal-patch.patch" } diff --git a/alpine/hide-hostname.patch b/alpine/hide-hostname.patch new file mode 100644 index 00000000..00d306ec --- /dev/null +++ b/alpine/hide-hostname.patch @@ -0,0 +1,24 @@ +diff --git a/pith/reply.c b/pith/reply.c +index ab4e97c..d7bdc91 100644 +--- a/pith/reply.c ++++ b/pith/reply.c +@@ -3369,13 +3369,17 @@ generate_message_id(void) + + get_alpine_revision_number(revisionbuf, sizeof(revisionbuf)); + if(F_ON(F_ROT13_MESSAGE_ID, ps_global)){ +- hostpart = rot13(ps_global->hostname); ++ hostpart = rot13(ps_global->userdomain ++ ? ps_global->userdomain ++ : ps_global->hostname); + alpine_name = rot13("alpine"); + alpine_version = rot5n(ALPINE_VERSION); + system_os = rot13(SYSTYPE); + revision = rot5n(revisionbuf); + } else { +- hostpart = cpystr(ps_global->hostname); ++ hostpart = cpystr(ps_global->userdomain ++ ? ps_global->userdomain ++ : ps_global->hostname); + alpine_name = cpystr("alpine"); + alpine_version = cpystr(ALPINE_VERSION); + system_os = cpystr(SYSTYPE); -- cgit v1.2.3-54-g00ecf