From 5646de4a9273897b8a619641ed988c4bb217a509 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 3 Feb 2014 03:28:00 +0000 Subject: Mon Feb 3 03:26:00 UTC 2014 --- core/ldns/PKGBUILD | 7 ++-- core/openldap/PKGBUILD | 6 ++-- core/openldap/openldap.install | 1 + core/openssh/PKGBUILD | 17 ++++----- core/openssh/sshdgenkeys.service | 10 +++--- core/s-nail/PKGBUILD | 15 +++++--- core/s-nail/sort.patch | 75 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 core/s-nail/sort.patch (limited to 'core') diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD index f815b0b3a..33b281866 100644 --- a/core/ldns/PKGBUILD +++ b/core/ldns/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197817 2013-10-30 11:04:09Z allan $ +# $Id: PKGBUILD 205001 2014-02-02 20:56:10Z bisson $ # Maintainer: Gaetan Bisson # Contributor: mathieui # Contributor: jiribb pkgname=ldns -pkgver=1.6.16 +pkgver=1.6.17 pkgrel=1 pkgdesc='Fast DNS library supporting recent RFCs' url='http://www.nlnetlabs.nl/projects/ldns/' @@ -14,7 +14,7 @@ depends=('openssl' 'dnssec-anchors') optdepends=('libpcap: ldns-dpa tool') makedepends=('libpcap') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('5b4fc6c5c3078cd061905c47178478cb1015c62a') +sha1sums=('4218897b3c002aadfc7280b3f40cda829e05c9a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +23,6 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ --disable-rpath \ --with-drill \ --with-examples \ diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 424e77ff9..5969a8fea 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200710 2013-12-02 22:13:10Z eric $ +# $Id: PKGBUILD 205013 2014-02-02 21:19:24Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') -pkgver=2.4.38 +pkgver=2.4.39 pkgrel=1 arch=('i686' 'x86_64') url="http://www.openldap.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch) -sha1sums=('b15132075661761dca822270cdbeddc3c49a6193' +sha1sums=('2b8e8401214867c361f7212e7058f95118b5bd6c' '2441815efbfa01ad7a1d39068e5503b53d1d04b0' '59241a813d7508294e4ef1cec3bfe1f5495e109d' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') diff --git a/core/openldap/openldap.install b/core/openldap/openldap.install index cf3cb9f25..a34ca1a10 100644 --- a/core/openldap/openldap.install +++ b/core/openldap/openldap.install @@ -1,4 +1,5 @@ post_install(){ + systemd-tmpfiles --create slapd.conf groupadd -g 439 ldap &>/dev/null useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null chown -R ldap:ldap var/lib/openldap &>/dev/null diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 63b69d345..b3c2fdf08 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 199078 2013-11-08 16:53:32Z bisson $ +# $Id: PKGBUILD 205002 2014-02-02 20:56:12Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh -pkgver=6.4p1 +pkgver=6.5p1 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' @@ -14,14 +14,14 @@ makedepends=('linux-headers') depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.pam') -sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d' - '6df5be396f8c593bb511a249a1453294d18a01a6' +sha1sums=('3363a72b4fee91b29cf2024ff633c17f6cd2f86d' 'SKIP' + 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' @@ -56,9 +56,10 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make tests || - grep $USER /etc/passwd | grep -q /bin/false - # connect.sh fails when run with stupid login shell + make tests || true + # hard to suitably test connectivity: + # - fails with /bin/false as login shell + # - fails with firewall activated, etc. } package() { diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service index 8c27d7110..1d01b7acf 100644 --- a/core/openssh/sshdgenkeys.service +++ b/core/openssh/sshdgenkeys.service @@ -2,12 +2,14 @@ Description=SSH Key Generation ConditionPathExists=|!/etc/ssh/ssh_host_key ConditionPathExists=|!/etc/ssh/ssh_host_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub [Service] ExecStart=/usr/bin/ssh-keygen -A diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD index afdc8a507..21c91e6ca 100644 --- a/core/s-nail/PKGBUILD +++ b/core/s-nail/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204556 2014-01-22 16:33:11Z bisson $ +# $Id: PKGBUILD 205003 2014-02-02 20:56:12Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Stéphane Gaudreault # Contributor: Sergej Pupykin @@ -6,15 +6,17 @@ pkgname=s-nail pkgver=14.5.2 -pkgrel=1 +pkgrel=2 pkgdesc='Mail processing system with a command syntax reminiscent of ed' url='http://sdaoden.users.sourceforge.net/code.html#s-nail' license=('custom:BSD') arch=('i686' 'x86_64') depends=('openssl') optdepends=('smtp-forwarder: for sending mail') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz") -sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz" + 'sort.patch') +sha1sums=('26ad43f5f41b429d5f13a3ce73a3dff75325950c' + '909da731e590d1d2877ed38bed667440a02d1259') groups=('base') backup=('etc/mail.rc') @@ -22,6 +24,11 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx') provides=('mailx' 'mailx-heirloom' 'heirloom-mailx') conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../sort.patch # http://sourceforge.net/mailarchive/message.php?msg_id=31906477 +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" make \ diff --git a/core/s-nail/sort.patch b/core/s-nail/sort.patch new file mode 100644 index 000000000..fdb8d526d --- /dev/null +++ b/core/s-nail/sort.patch @@ -0,0 +1,75 @@ +s-nail-14_5_2-sort.patch, 2014-01-30: + +Apply: + $ cd s-nail-14.5.2 + $ patch -bu < s-nail-14_5_2-sort.patch + +Description: +Reverses (sort(),thread(): use srelax()!, 2014-01-18, [a9b67e9]), which +was a hasty commit of an untested diff that i've added few minutes +beforehand. +It was of course wrong. +The problem (no memory relaxation during entire sort operation) requires +a different approach (either only relax when we don't need to hold +dope storage (as for SORT_TO/SORT_FROM/SORT_SUBJECT/+) or use heap +memory for those allocations, then). + +s-nail-14_5_2-sort-alt.patch is an alternative working thesis that uses +heap allocations, thus continues to relax the dope storage. +This version has been pushed to [master]. + +diff --git a/thread.c b/thread.c +index 3ac5966..9ec1ac9 100644 +--- a/thread.c ++++ b/thread.c +@@ -361,8 +361,6 @@ makethreads(struct message *m, long cnt, int nmail) + return; + mprime = nextprime(cnt); + mt = scalloc(mprime, sizeof *mt); +- +- srelax_hold(); + for (i = 0; i < cnt; i++) { + if ((m[i].m_flag&MHIDDEN) == 0) { + mlook(NULL, mt, &m[i], mprime); +@@ -376,7 +374,6 @@ makethreads(struct message *m, long cnt, int nmail) + m[i].m_level = 0; + if (!nmail && !(inhook&2)) + m[i].m_collapsed = 0; +- srelax(); + } + /* + * Most folders contain the eldest messages first. Traversing +@@ -387,12 +384,8 @@ makethreads(struct message *m, long cnt, int nmail) + * are replies to the one message, and are sorted such that + * youngest messages occur first. + */ +- for (i = cnt-1; i >= 0; i--) { ++ for (i = cnt-1; i >= 0; i--) + lookup(&m[i], mt, mprime); +- srelax(); +- } +- srelax_rele(); +- + threadroot = interlink(m, cnt, nmail); + finalize(threadroot); + free(mt); +@@ -572,8 +565,6 @@ sort(void *vp) + default: + break; + } +- +- srelax_hold(); + for (n = 0, i = 0; i < msgCount; i++) { + mp = &message[i]; + if ((mp->m_flag&MHIDDEN) == 0) { +@@ -637,10 +628,7 @@ sort(void *vp) + mp->m_child = mp->m_younger = mp->m_elder = mp->m_parent = NULL; + mp->m_level = 0; + mp->m_collapsed = 0; +- srelax(); + } +- srelax_rele(); +- + if (n > 0) { + qsort(ms, n, sizeof *ms, func); + threadroot = &message[ms[0].ms_n]; -- cgit v1.2.3-54-g00ecf