systemd-226-1.parabola1: updating version

2 files changed, 45 insertions, 45 deletions

diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 5f16c3cce..dff535123 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=systemd
 pkgname=systemd
-pkgver=225
-pkgrel=1.parabola2
+pkgver=226
+pkgrel=1.parabola1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
@@ -28,10 +28,10 @@ md5sums=('SKIP'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '36ee74767ac8734dede1cbd0f4f275d7'
          '9b9f4a58e4c4009bf5290c5b297600c3'
-         '5d7e15f4bd660cba06a7323b53c1e777')
+         '15b4bd1982d5d263f12806b0b1dc3e96')
 
 prepare() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   # Rename "Linux" -> "GNU/Linux"
   patch -Np1 -i "$srcdir/gnu+linux.patch"
@@ -46,7 +46,7 @@ prepare() {
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   local timeservers=({0..3}.arch.pool.ntp.org)
 
@@ -103,7 +103,7 @@ package_systemd() {
           etc/udev/udev.conf)
   install="systemd.install"
 
-  make -C "$pkgname" DESTDIR="$pkgdir" install
+  make -C "$pkgbase" DESTDIR="$pkgdir" install
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
@@ -113,7 +113,7 @@ package_systemd() {
   rm -r "$pkgdir/usr/lib/rpm"
 
   # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+  install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
 
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
diff --git a/libre/systemd/gnu+linux.patch b/libre/systemd/gnu+linux.patch
index 3dbe5259b..36cab8289 100644
--- a/libre/systemd/gnu+linux.patch
+++ b/libre/systemd/gnu+linux.patch
@@ -107,8 +107,8 @@ diff -Nur a/man/kernel-install.xml b/man/kernel-install.xml
            the file <filename>initrd</filename> is found next to the
            <filename>linux</filename> file, the initrd will be added to
 diff -Nur a/man/os-release.xml b/man/os-release.xml
---- a/man/os-release.xml	2015-09-11 14:55:47.368340904 -0300
-+++ b/man/os-release.xml	2015-09-11 15:30:35.417171013 -0300
+--- a/man/os-release.xml	2015-09-20 20:12:13.796706013 -0300
++++ b/man/os-release.xml	2015-09-20 20:14:32.399758269 -0300
 @@ -121,8 +121,8 @@
          <listitem><para>A string identifying the operating system,
          without a version component, and suitable for presentation to
@@ -179,16 +179,16 @@ diff -Nur a/man/os-release.xml b/man/os-release.xml
        </varlistentry>
  
        <varlistentry>
-@@ -218,7 +217,7 @@
-         the <ulink url="https://cpe.mitre.org/specification/">Common
+@@ -219,7 +218,7 @@
+         <ulink url="http://scap.nist.gov/specifications/cpe/">Common
          Platform Enumeration Specification</ulink> as proposed by the
-         MITRE Corporation. This field is optional. Example:
+         NIST. This field is optional. Example:
 -        <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
 +        <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>
          </para></listitem>
        </varlistentry>
  
-@@ -253,8 +252,8 @@
+@@ -254,8 +253,8 @@
          one URL shall be listed in each setting. If multiple resources
          need to be referenced, it is recommended to provide an online
          landing page linking all available resources. Examples:
@@ -199,7 +199,7 @@ diff -Nur a/man/os-release.xml b/man/os-release.xml
        </varlistentry>
  
        <varlistentry>
-@@ -329,21 +328,22 @@
+@@ -330,21 +329,22 @@
      recommended to prefix new fields with an OS specific
      name in order to avoid name clashes. Applications
      reading this file must ignore unknown fields. Example:
@@ -232,18 +232,6 @@ diff -Nur a/man/os-release.xml b/man/os-release.xml
    </refsect1>
  
    <refsect1>
-diff -Nur a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
---- a/man/sd_bus_error_add_map.xml	2015-09-11 14:55:47.369340911 -0300
-+++ b/man/sd_bus_error_add_map.xml	2015-09-11 15:31:21.081524317 -0300
-@@ -82,7 +82,7 @@
- 
-     <para>The <function>sd_bus_error_add_map()</function> call may be
-     used to register additional mappings for converting D-Bus errors
--    to Linux <varname>errno</varname>-style errors. The mappings
-+    to GNU/Linux <varname>errno</varname>-style errors. The mappings
-     defined with this call are consulted by calls such as
-     <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-     or
 diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
 --- a/man/sd-bus-errors.xml	2015-09-11 14:55:47.368340904 -0300
 +++ b/man/sd-bus-errors.xml	2015-09-11 15:31:32.009608698 -0300
@@ -256,18 +244,6 @@ diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
      project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
      to D-Bus errors and back. For example, the error
      <constant>EUCLEAN</constant> is mapped to
-diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
---- a/man/sd_is_fifo.xml	2015-09-11 14:55:47.372340932 -0300
-+++ b/man/sd_is_fifo.xml	2015-09-11 15:32:47.346188708 -0300
-@@ -145,7 +145,7 @@
-     the <parameter>path</parameter> parameter is
-     <constant>NULL</constant>. For normal file system
-     <constant>AF_UNIX</constant> sockets, set the
--    <parameter>length</parameter> parameter to 0. For Linux abstract
-+    <parameter>length</parameter> parameter to 0. For GNU/Linux abstract
-     namespace sockets, set the <parameter>length</parameter> to the
-     size of the address, including the initial 0 byte, and set the
-     <parameter>path</parameter> to the initial 0 byte of the socket
 diff -Nur a/man/sd-login.xml b/man/sd-login.xml
 --- a/man/sd-login.xml	2015-09-11 14:55:47.368340904 -0300
 +++ b/man/sd-login.xml	2015-09-11 15:33:41.770605951 -0300
@@ -282,6 +258,30 @@ diff -Nur a/man/sd-login.xml b/man/sd-login.xml
  
      <para>Note that these APIs only allow purely passive access and
      monitoring of seats, sessions and users. To actively make changes
+diff -Nur a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
+--- a/man/sd_bus_error_add_map.xml	2015-09-11 14:55:47.369340911 -0300
++++ b/man/sd_bus_error_add_map.xml	2015-09-11 15:31:21.081524317 -0300
+@@ -82,7 +82,7 @@
+ 
+     <para>The <function>sd_bus_error_add_map()</function> call may be
+     used to register additional mappings for converting D-Bus errors
+-    to Linux <varname>errno</varname>-style errors. The mappings
++    to GNU/Linux <varname>errno</varname>-style errors. The mappings
+     defined with this call are consulted by calls such as
+     <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+     or
+diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
+--- a/man/sd_is_fifo.xml	2015-09-11 14:55:47.372340932 -0300
++++ b/man/sd_is_fifo.xml	2015-09-11 15:32:47.346188708 -0300
+@@ -145,7 +145,7 @@
+     the <parameter>path</parameter> parameter is
+     <constant>NULL</constant>. For normal file system
+     <constant>AF_UNIX</constant> sockets, set the
+-    <parameter>length</parameter> parameter to 0. For Linux abstract
++    <parameter>length</parameter> parameter to 0. For GNU/Linux abstract
+     namespace sockets, set the <parameter>length</parameter> to the
+     size of the address, including the initial 0 byte, and set the
+     <parameter>path</parameter> to the initial 0 byte of the socket
 diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml
 --- a/man/sd_notify.xml	2015-09-11 14:55:47.374340946 -0300
 +++ b/man/sd_notify.xml	2015-09-11 15:34:14.466855938 -0300
@@ -295,8 +295,8 @@ diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml
      service, using SCM_CREDENTIALS.</para>
    </refsect1>
 diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
---- a/man/systemd-detect-virt.xml	2015-09-11 14:55:47.377340967 -0300
-+++ b/man/systemd-detect-virt.xml	2015-09-11 15:43:31.015047569 -0300
+--- a/man/systemd-detect-virt.xml	2015-09-20 20:12:13.803372347 -0300
++++ b/man/systemd-detect-virt.xml	2015-09-20 20:12:54.388005823 -0300
 @@ -104,16 +104,6 @@
            </row>
  
@@ -314,7 +314,7 @@ diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
        <entry><varname>oracle</varname></entry>
        <entry>Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems)</entry>
            </row>
-@@ -141,12 +131,12 @@
+@@ -146,12 +136,12 @@
  
            <row>
        <entry><varname>lxc</varname></entry>
@@ -354,8 +354,8 @@ diff -Nur a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
      machine ID. For details see the documentation of the <ulink
      url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
 diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
---- a/man/systemd-nspawn.xml	2015-09-11 14:55:47.379340981 -0300
-+++ b/man/systemd-nspawn.xml	2015-09-11 16:07:48.210766346 -0300
+--- a/man/systemd-nspawn.xml	2015-09-20 20:12:13.806705513 -0300
++++ b/man/systemd-nspawn.xml	2015-09-20 20:12:54.388005823 -0300
 @@ -91,7 +91,7 @@
  
      <para>In contrast to
@@ -374,7 +374,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
      to set up an OS directory tree suitable as file system hierarchy
      for <command>systemd-nspawn</command> containers.</para>
  
-@@ -783,46 +783,35 @@
+@@ -838,46 +838,35 @@
      <title>Examples</title>
  
      <example>
@@ -433,7 +433,7 @@ diff -Nur a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
        in a namespace container in it.</para>
      </example>
  
-@@ -860,7 +849,7 @@
+@@ -916,7 +905,7 @@
        <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
        <citerefentry project='die-net'><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
        <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,