summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/dirmngr/PKGBUILD4
-rw-r--r--core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch60
-rw-r--r--core/glib2/PKGBUILD49
-rw-r--r--core/gnupg/PKGBUILD4
-rw-r--r--core/gpgme/PKGBUILD10
-rw-r--r--core/libksba/PKGBUILD8
-rw-r--r--core/libusbx/PKGBUILD6
-rw-r--r--core/perl/PKGBUILD7
-rw-r--r--core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch167
-rw-r--r--core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch35
-rw-r--r--core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch48
-rw-r--r--core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch36
-rw-r--r--core/systemd/PKGBUILD20
13 files changed, 162 insertions, 292 deletions
diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD
index 40e0c74fc..1a623548b 100644
--- a/core/dirmngr/PKGBUILD
+++ b/core/dirmngr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155870 2012-04-08 07:13:40Z tpowa $
+# $Id: PKGBUILD 183488 2013-04-22 09:10:15Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=dirmngr
pkgver=1.1.0
-pkgrel=4
+pkgrel=5
pkgdesc="A daemon to handle CRL and certificate requests"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch
new file mode 100644
index 000000000..b4ce93e83
--- /dev/null
+++ b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch
@@ -0,0 +1,60 @@
+From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc@archlinux.org>
+Date: Thu, 21 Mar 2013 20:47:57 +0100
+Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations
+ (tabs to spaces) - Replace print with print(), still works with Python 2.x
+
+---
+ glib/gtester-report | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/glib/gtester-report b/glib/gtester-report
+index 0fcdd9a..00296ea 100755
+--- a/glib/gtester-report
++++ b/glib/gtester-report
+@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter):
+ if binary.success_cases:
+ oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter
+ if real_cases != 0:
+- self.oprint ('<a %s>ER</a>\n' % erlink)
+- self.oprint ('<a %s>OK</a>\n' % oklink)
+- self.oprint ('</td>\n')
+- perc = binary.success_cases * 100.0 / real_cases
+- pcolor = {
+- 100 : 'bgcolor="lightgreen"',
+- 0 : 'bgcolor="red"',
+- }.get (int (perc), 'bgcolor="yellow"')
+- self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
+- self.oprint ('</tr>\n')
++ self.oprint ('<a %s>ER</a>\n' % erlink)
++ self.oprint ('<a %s>OK</a>\n' % oklink)
++ self.oprint ('</td>\n')
++ perc = binary.success_cases * 100.0 / real_cases
++ pcolor = {
++ 100 : 'bgcolor="lightgreen"',
++ 0 : 'bgcolor="red"',
++ }.get (int (perc), 'bgcolor="yellow"')
++ self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc))
++ self.oprint ('</tr>\n')
+ else:
+- self.oprint ('Empty\n')
+- self.oprint ('</td>\n')
+- self.oprint ('</tr>\n')
++ self.oprint ('Empty\n')
++ self.oprint ('</td>\n')
++ self.oprint ('</tr>\n')
+ for tc in binary.testcases:
+ self.handle_testcase (tc, binary)
+ def handle_totals (self):
+@@ -466,7 +466,7 @@ def parse_opts():
+ " Needs python-subunit]")
+ options, files = parser.parse_args()
+ if options.version:
+- print parser.epilog
++ print(parser.epilog)
+ return None, None
+ if len(files) != 1:
+ parser.error("Must supply a log file to parse.")
+--
+1.8.2
+
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 9a79b47ed..d277d9892 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 172097 2012-11-28 10:31:12Z jgc $
+# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=glib2
-pkgver=2.34.3
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.36.1
pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
revert-warn-glib-compile-schemas.patch)
-sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7'
+sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
build() {
cd glib-$pkgver
- patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+ patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
--with-pcre=system \
@@ -27,12 +24,40 @@ build() {
make
}
-package() {
+check() {
+ cd glib-$pkgver
+ #make -k check || :
+}
+
+package_glib2() {
+ depends=('pcre' 'libffi')
+ optdepends=('python2: for gdbus-codegen and gtester-report'
+ 'elfutils: gresource inspection tool')
+ options=('!docs' '!libtool' '!emptydirs')
+ license=('LGPL')
+
cd glib-$pkgver
make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
chmod -x "$_i"
done
- sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+
+ # Our gdb does not ship the required python modules, so remove it
+ rm -rf "$pkgdir/usr/share/gdb/"
+}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for glib2"
+ conflicts=('gobject2-docs')
+ replaces=('gobject2-docs')
+ license=('custom')
+ options=('docs' '!emptydirs')
+
+ cd glib-$pkgver/docs
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
+ install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
+
+ rm -rf "${pkgdir}/usr/share/man"
}
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index db0e5dd2e..31081061f 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178149 2013-02-17 00:23:25Z bisson $
+# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=gnupg
pkgver=2.0.19
-pkgrel=6
+pkgrel=7
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
license=('GPL')
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 2a97025bd..2893dac39 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180087 2013-03-16 12:44:18Z tpowa $
+# $Id: PKGBUILD 183490 2013-04-22 09:10:17Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgname=gpgme
-pkgver=1.3.2
+pkgver=1.4.0
pkgrel=1
pkgdesc="A C wrapper library for GnuPG"
arch=('i686' 'x86_64')
@@ -14,12 +14,12 @@ depends=('libgpg-error' 'pth' 'gnupg>=2')
install=${pkgname}.install
options=('!libtool' '!emptydirs')
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('326fe97077141713f0930aa87949a287'
- '4849bea218571c5ab6094d77049bd5d7')
+md5sums=('a0f93aba6d8a831ba14905085027f2f9'
+ 'SKIP')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --disable-static
+ ./configure --prefix=/usr --disable-static --disable-gpgsm-test
make
}
diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD
index 2d9c74a2d..e4378f847 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177036 2013-02-05 00:36:51Z allan $
+# $Id: PKGBUILD 183487 2013-04-22 09:10:14Z tpowa $
# Maintainer:
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=libksba
-pkgver=1.2.0
-pkgrel=3
+pkgver=1.3.0
+pkgrel=1
pkgdesc="A CMS and X.509 access library"
arch=(i686 x86_64)
license=('GPL')
@@ -29,4 +29,4 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
-md5sums=('e797f370b69b4dc776499d6a071ae137')
+md5sums=('cd86fad9c9d360b2cf80449f8a4a4075')
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index c1d1daf32..fea42b7ac 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 168151 2012-10-06 11:21:13Z tpowa $
+# $Id: PKGBUILD 183491 2013-04-22 09:10:18Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libusbx
-pkgver=1.0.14
+pkgver=1.0.15
pkgrel=1
depends=('glibc')
pkgdesc="Library that provides generic access to USB device"
@@ -13,7 +13,7 @@ options=(!libtool)
replaces=('libusb1' 'libusb')
provides=("libusb=$pkgver")
conflicts=("libusb")
-md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470')
+md5sums=('0fa83bfd8845893b9b28a921297606d0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 29693141f..ce3d5ac29 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $
+# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $
# Maintainer: Florian Pritz <bluewind@xinu.at>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: kevin <kevin.archlinux.org>
@@ -7,7 +7,7 @@
pkgname=perl
pkgver=5.16.3
-pkgrel=2
+pkgrel=3
pkgdesc="A highly capable, feature-rich programming language"
arch=(i686 x86_64)
license=('GPL' 'PerlArtistic')
@@ -39,6 +39,9 @@ build() {
patch -i "$srcdir/cgi-cr-escaping.diff" -p1
patch -i "$srcdir/CVE-2012-6329.patch" -p1
+ # Fix FS#34531; in perl upstream >= 5.17.9
+ sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+
if [ "${CARCH}" = "x86_64" ]; then
# for x86_64
arch_opts="-Dcccdlflags='-fPIC'"
diff --git a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
deleted file mode 100644
index c245ce1e2..000000000
--- a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sat, 13 Apr 2013 20:22:53 -0400
-Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63477
----
- src/binfmt/binfmt.c | 2 +-
- src/journal/catalog.c | 2 +-
- src/modules-load/modules-load.c | 2 +-
- src/shared/conf-parser.c | 2 +-
- src/shared/install.c | 2 +-
- src/shared/util.h | 2 +-
- src/sysctl/sysctl.c | 2 +-
- src/test/test-unit-file.c | 31 +++++++++++++++++++++++++++++++
- 8 files changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 9ca1e60..5a42b3d 100644
---- a/src/binfmt/binfmt.c
-+++ b/src/binfmt/binfmt.c
-@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
- p = strstrip(l);
- if (!*p)
- continue;
-- if (strchr(COMMENTS, *p))
-+ if (strchr(COMMENTS "\n", *p))
- continue;
-
- k = apply_rule(p);
-diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index ebf0622..7681af6 100644
---- a/src/journal/catalog.c
-+++ b/src/journal/catalog.c
-@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
- continue;
- }
-
-- if (strchr(COMMENTS, line[0]))
-+ if (strchr(COMMENTS "\n", line[0]))
- continue;
-
- if (empty_line &&
-diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 9ee2603..b3f7af0 100644
---- a/src/modules-load/modules-load.c
-+++ b/src/modules-load/modules-load.c
-@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
- l = strstrip(line);
- if (!*l)
- continue;
-- if (strchr(COMMENTS, *l))
-+ if (strchr(COMMENTS "\n", *l))
- continue;
-
- k = load_module(ctx, l);
-diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index fbacf98..fea2e56 100644
---- a/src/shared/conf-parser.c
-+++ b/src/shared/conf-parser.c
-@@ -174,7 +174,7 @@ static int parse_line(
- if (!*l)
- return 0;
-
-- if (strchr(COMMENTS, *l))
-+ if (strchr(COMMENTS "\n", *l))
- return 0;
-
- if (startswith(l, ".include ")) {
-diff --git a/src/shared/install.c b/src/shared/install.c
-index f9d223e..71e0433 100644
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) {
- if (!*l)
- continue;
-
-- if (strchr(COMMENTS, *l))
-+ if (strchr(COMMENTS "\n", *l))
- continue;
-
- if (first_word(l, "enable")) {
-diff --git a/src/shared/util.h b/src/shared/util.h
-index 99ec0a3..ad97536 100644
---- a/src/shared/util.h
-+++ b/src/shared/util.h
-@@ -52,7 +52,7 @@ union dirent_storage {
- #define WHITESPACE " \t\n\r"
- #define NEWLINE "\n\r"
- #define QUOTES "\"\'"
--#define COMMENTS "#;\n"
-+#define COMMENTS "#;"
-
- #define FORMAT_BYTES_MAX 8
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index e0ba78a..db18dd9 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
- if (!*p)
- continue;
-
-- if (strchr(COMMENTS, *p))
-+ if (strchr(COMMENTS "\n", *p))
- continue;
-
- value = strchr(p, '=');
-diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 3cf8463..1bf11e6 100644
---- a/src/test/test-unit-file.c
-+++ b/src/test/test-unit-file.c
-@@ -199,6 +199,17 @@ static void test_config_parse_exec(void) {
- "#--nouser-config \\\n" \
- "normal=line"
-
-+#define env_file_4 \
-+ "# Generated\n" \
-+ "\n" \
-+ "HWMON_MODULES=\"coretemp f71882fg\"\n" \
-+ "\n" \
-+ "# For compatibility reasons\n" \
-+ "\n" \
-+ "MODULE_0=coretemp\n" \
-+ "MODULE_1=f71882fg"
-+
-+
- static void test_load_env_file_1(void) {
- char _cleanup_strv_free_ **data = NULL;
- int r;
-@@ -251,6 +262,25 @@ static void test_load_env_file_3(void) {
- unlink(name);
- }
-
-+static void test_load_env_file_4(void) {
-+ char _cleanup_strv_free_ **data = NULL;
-+ int r;
-+
-+ char name[] = "/tmp/test-load-env-file.XXXXXX";
-+ int _cleanup_close_ fd = mkstemp(name);
-+ assert(fd >= 0);
-+ assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));
-+
-+ r = load_env_file(name, NULL, &data);
-+ assert(r == 0);
-+ assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg"));
-+ assert(streq(data[1], "MODULE_0=coretemp"));
-+ assert(streq(data[2], "MODULE_1=f71882fg"));
-+ assert(data[3] == NULL);
-+ unlink(name);
-+}
-+
-+
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wnonnull"
-
-@@ -327,6 +357,7 @@ int main(int argc, char *argv[]) {
- test_load_env_file_1();
- test_load_env_file_2();
- test_load_env_file_3();
-+ test_load_env_file_4();
- test_install_printf();
-
- return 0;
---
-1.8.2.1
-
diff --git a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
deleted file mode 100644
index 19edce5f4..000000000
--- a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d378991747d67fff1d4dc39e7fb2bc8f49f1b561 Mon Sep 17 00:00:00 2001
-From: Mirco Tischler <mt-ml@gmx.de>
-Date: Sat, 13 Apr 2013 01:03:49 +0200
-Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and
- _MACHINE_ID
-
----
- src/journal/journald-server.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 53e3830..be84323 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -538,7 +538,7 @@ static void dispatch_message_real(
- char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)],
- uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)],
- gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)],
-- source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))],
-+ source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)],
- boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=",
- machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID=";
-
-@@ -699,7 +699,7 @@ static void dispatch_message_real(
-
- r = sd_id128_get_machine(&id);
- if (r >= 0) {
-- sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1);
-+ sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1);
- IOVEC_SET_STRING(iovec[n++], machine_id);
- }
-
---
-1.8.2.1
-
diff --git a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
deleted file mode 100644
index 9cac29b77..000000000
--- a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 50fb97935d689a520251b2d543599be14bdfd0ed Mon Sep 17 00:00:00 2001
-From: Fedora systemd team <systemd-maint@redhat.com>
-Date: Wed, 10 Apr 2013 09:49:24 +0200
-Subject: [PATCH] logind: avoid creating stale session state files
-
-There were old session state files accumulating in /run/systemd/session.
-They confused e.g. "reboot", which thought there were still users logged
-in. The files got created like this:
-
-session_stop(Session *s) ->
- ...
- unlink(s->state_file);
- ...
- seat_set_active(s->seat, NULL) ->
- session_save(...); /* re-creates the state file we just
- unlinked */
-
-Fix it simply by clearing the s->started flag earlier to prevent
-any further writes of the state file (session_save() checks the flag).
----
- src/login/logind-session.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 508336d..e2f41d3 100644
---- a/src/login/logind-session.c
-+++ b/src/login/logind-session.c
-@@ -710,6 +710,8 @@ int session_stop(Session *s) {
- if (s->started)
- session_send_signal(s, false);
-
-+ s->started = false;
-+
- if (s->seat) {
- if (s->seat->active == s)
- seat_set_active(s->seat, NULL);
-@@ -721,8 +723,6 @@ int session_stop(Session *s) {
- user_send_changed(s->user, "Sessions\0");
- user_save(s->user);
-
-- s->started = false;
--
- return r;
- }
-
---
-1.8.2.1
-
diff --git a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
new file mode 100644
index 000000000..24dd6d766
--- /dev/null
+++ b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
@@ -0,0 +1,36 @@
+From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 19 Apr 2013 16:31:25 -0400
+Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used
+
+---
+ src/nss-myhostname/nss-myhostname.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
+index 16ccb3e..8699098 100644
+--- a/src/nss-myhostname/nss-myhostname.c
++++ b/src/nss-myhostname/nss-myhostname.c
+@@ -25,7 +25,6 @@
+ #include <netdb.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <assert.h>
+ #include <unistd.h>
+ #include <net/if.h>
+ #include <stdlib.h>
+@@ -35,6 +34,11 @@
+ #include "macro.h"
+ #include "util.h"
+
++/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
++ * libnss_myhostname will be linked into arbitrary programs which will, in turn
++ * attempt to write to the journal via log_dispatch() */
++#include <assert.h>
++
+ /* We use 127.0.0.2 as IPv4 address. This has the advantage over
+ * 127.0.0.1 that it can be translated back to the local hostname. For
+ * IPv6 we use ::1 which unfortunately will not translate back to the
+--
+1.8.2.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 360aec4fd..9ba7c9f71 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=201
+pkgver=202
pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -16,17 +16,13 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
- '0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch'
- '0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch'
- '0001-logind-avoid-creating-stale-session-state-files.patch'
+ '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch'
'use-split-usr-path.patch')
-md5sums=('3e758392ff0e9206b3f7ee252b4a654b'
+md5sums=('3136c6912d3ee1f6d4deb16234783731'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
- 'd575a29ca735944aa45126ab9d3087a5'
- '8170482f10bb0420770a64dce23975bc'
- 'b1355aae98071e83fca27549a0ac3def'
+ '3090c0b9b19b76731b4cf9c01c10c534'
'76bf83fe34c5b40533abc5dc940576a6')
prepare() {
@@ -35,9 +31,7 @@ prepare() {
# hang onto this until we do the /{,s}bin merge
patch -Np1 <"$srcdir/use-split-usr-path.patch"
- patch -Np1 <"$srcdir/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch"
- patch -Np1 <"$srcdir/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch"
- patch -Np1 <"$srcdir/0001-logind-avoid-creating-stale-session-state-files.patch"
+ patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch"
}
build() {
@@ -67,7 +61,9 @@ package_systemd() {
pkgdesc="system and service manager"
depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
'pam' 'util-linux' 'xz')
- provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+ provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
+ 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+ 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
optdepends=('cryptsetup: required for encrypted block devices'
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-14 05:44:33 +0000