testing/lightdm: Upgrade to 1.26.0, improve abuild

* Clarify license
* Allow null passwords
* Improve APKBUILD, update patches
* Add -openrc subpackage

7 files changed, 82 insertions, 95 deletions

diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index 21d908b278..a5cc88074d 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -1,84 +1,58 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lightdm
-pkgver=1.10.1
-pkgrel=7
+pkgver=1.26.0
+pkgrel=0
 pkgdesc="A cross-desktop display manager"
 url="http://www.freedesktop.org/wiki/Software/LightDM"
 arch="all"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
 depends="dbus xinit accountsservice"
-depends_dev="glib-dev libxklavier-dev libx11-dev"
-makedepends="$depends_dev linux-pam-dev gtk+3.0-dev libxext-dev
+makedepends="linux-pam-dev gtk+3.0-dev libxext-dev libxklavier-dev
 	autoconf automake libtool gobject-introspection-dev itstool
 	libgcrypt-dev libxml2-utils"
 install="$pkgname.pre-install"
 pkgusers="lightdm"
 pkggroups="lightdm"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://launchpad.net/lightdm/${pkgver%.*}/$pkgver/+download/lightdm-$pkgver.tar.xz
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
+source="https://github.com/CanonicalLtd/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz
 	musl-language.patch
 	musl-is-linux.patch
 	musl-updwtmpx.patch
 	disallow-guest.patch
+	allow-null-passwd.patch
 	lightdm.initd"
 
-_builddir="$srcdir"/lightdm-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
-	cd "$_builddir"
-	CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \
+	cd "$builddir"
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-liblightdm-gobject \
-		--with-greeter-session=lightdm-gtk-greeter \
-		|| return 1
+		--disable-tests \
+		--with-greeter-session=lightdm-gtk-greeter
 
-	# workaround build bug
-	touch tests/src/lightdm-session
-
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	mv "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	ln -s /etc/X11/xinit/Xsession "$pkgdir"/usr/bin/lightdm-session
-
-	install -Dm755 "$srcdir"/lightdm.initd "$pkgdir"/etc/init.d/lightdm \
-		|| return 1
-	install -o lightdm -g lightdm -d "$pkgdir"/var/lib/lightdm-data \
-		|| return 1
+	install -Dm755 "$srcdir"/lightdm.initd "$pkgdir"/etc/init.d/lightdm
+	install -o lightdm -g lightdm -d "$pkgdir"/var/lib/lightdm-data
+	rm -rf "$pkgdir"/etc/apparmor.d
 }
 
-md5sums="b237530f833bd3aafe613a85b76a5826  lightdm-1.10.1.tar.xz
-9ec182924cb4c113c6ca70eb34e9192d  musl-language.patch
-83463e0720df1c4462fd988d48ae4edc  musl-is-linux.patch
-518dbd5723f352c19d59f3d645ee1636  musl-updwtmpx.patch
-19a8a105b6d60c4c5c4e8138f57cb105  disallow-guest.patch
-ad8dcfcc2473c7846e7590715e3947d7  lightdm.initd"
-sha256sums="737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f  lightdm-1.10.1.tar.xz
-869834983f3dfd4818aac7b18b78e4c78a4e3bdf3740c7a21be2fa9b56e7664e  musl-language.patch
-65e8d3ae8f40c5803b89e66b2cbeb9b0dbc7303c398770a9e28680312b1864f5  musl-is-linux.patch
-38bfafdf569407f98261f998936ce23152fa9e4c53b797f6f775c697c7c25ebe  musl-updwtmpx.patch
-97f658c6382133ce3456de59c70ebe1a850a1035cb871ff1e0885027559e56dd  disallow-guest.patch
-b6494fa4393688119940aea71cb9b46ae84072e4f44dae5cdccdbd5c888ac418  lightdm.initd"
-sha512sums="e235eeb03999d31d693c89a0e06fc33371d40f7c3c216942440a8498990b1efa0b5f19c72bc0ed18611a3b401b8ee521e2c2caa5e441247bad625466a8346278  lightdm-1.10.1.tar.xz
-04df1146c8e33410c0fbbd016a3197e7e11b8ac5792f4578cb1a3fccba432294e1f4597b3fcab85f5167cac3dea8ead416872cf8c97cf381db5d0d7e9772d1a7  musl-language.patch
-480b2757321212aa04c265ee052f2226059dc45c99a2e19c9dd06198bf03237a34ccdd87d997eb0e1addcf8e1d429a43e0d61e9e0b871f7dc28d203ee7fc2006  musl-is-linux.patch
-46ab123c1b0e9d89020dbb50f73418e41aa9fb5c7614eaf1add0aca3496f2f178e7f0e485abbd0de2ed15297ff00099e37ef7f7d245d280ec356d5d7b09af77d  musl-updwtmpx.patch
-404a4cb4f58921e750aa29b3757c684ecb9d2b9146fd31b7359e49bf3a63400f757bb85d9f3ceabf0cbabc88bbbd18f11369713ccd7bae18574821c75af7143f  disallow-guest.patch
-758c63b7b1382cb0adabd1a6af6af49333ce2950c95ae1199040647b7d49faf27e0e4572264b5533c7db8a4220e9ccc9aeb0d7e8221ef202184745694d9b7371  lightdm.initd"
+sha512sums="67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7  lightdm-1.26.0.tar.xz
+592d630bdabeed304f8b677ceb0ebd2a6ab0930baae473814aafb0d58b7e28a79c8c667f18a656a460132c48a9fee90be7eebd50f835ea641d6d99387b28310a  musl-language.patch
+aa33888f61b61f6c8082c77dc0b539fa14fb395c17e70b825ba88af7bb6adaad8f99583342a77442c60c105c1b83dd6eb0547fbddb43dcd767d9ad2c65ca2baf  musl-is-linux.patch
+876088f21e502630c7d13343b03785d3327727c25657690c8e1cff5428a36944eb75d538f24ab4f5b11f931d8fad51241f25046da370eb5868aa8d2860be4eb2  musl-updwtmpx.patch
+c5bf8cfc0b4c4f95d9c9a3fa517b6c8ec90e02d84fb4498176b4745ed6089576fab536e9a3595200443811f05f2d47ac5e7c0205c878d9c23eff4dda7093ad6c  disallow-guest.patch
+7d31a5d7034e665a86a7067654c8865fa5db98b58c32afab6077d589c0cd1351bfbfb4625e5e1b2ccf8c98bc08e7c97412c528311c3c32da0b8e45916f8de767  allow-null-passwd.patch
+212fb5830e6c76a3e396d38d55ad03b5a4a49f4ddc48fe60976612cee1ab5f0cc9867129e676929b421557be84c4db6699850a0408de9b16bd5ef34b6c7fbd51  lightdm.initd"
diff --git a/testing/lightdm/allow-null-passwd.patch b/testing/lightdm/allow-null-passwd.patch
new file mode 100644
index 0000000000..0d30d5d7f9
--- /dev/null
+++ b/testing/lightdm/allow-null-passwd.patch
@@ -0,0 +1,11 @@
+--- a/data/pam/lightdm	2018-04-29 21:13:23.633200880 +0300
++++ b/data/pam/lightdm	2018-04-29 21:14:24.817767352 +0300
+@@ -7,7 +7,7 @@
+ auth      required pam_env.so
+ 
+ # Use /etc/passwd and /etc/shadow for passwords
+-auth      required pam_unix.so
++auth      required pam_unix.so nullok
+ 
+ # Check account is active, change password if required
+ account   required pam_unix.so
diff --git a/testing/lightdm/disallow-guest.patch b/testing/lightdm/disallow-guest.patch
index 72782d3a79..237b571094 100644
--- a/testing/lightdm/disallow-guest.patch
+++ b/testing/lightdm/disallow-guest.patch
@@ -1,20 +1,20 @@
---- ./src/lightdm.c.orig
-+++ ./src/lightdm.c
-@@ -1067,7 +1067,7 @@
-     if (!config_has_key (config_get_instance (), "SeatDefaults", "start-session"))
-         config_set_boolean (config_get_instance (), "SeatDefaults", "start-session", TRUE);
-     if (!config_has_key (config_get_instance (), "SeatDefaults", "allow-guest"))
--        config_set_boolean (config_get_instance (), "SeatDefaults", "allow-guest", TRUE);
-+        config_set_boolean (config_get_instance (), "SeatDefaults", "allow-guest", FALSE);
-     if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-allow-guest"))
-         config_set_boolean (config_get_instance (), "SeatDefaults", "greeter-allow-guest", TRUE);
-     if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-show-remote-login"))
---- ./data/lightdm.conf.orig
-+++ ./data/lightdm.conf
-@@ -91,7 +91,7 @@
- #greeter-show-manual-login=false
+--- a/src/lightdm.c
++++ b/src/lightdm.c
+@@ -779,7 +779,7 @@
+     if (!config_has_key (config_get_instance (), "Seat:*", "allow-user-switching"))
+         config_set_boolean (config_get_instance (), "Seat:*", "allow-user-switching", TRUE);
+     if (!config_has_key (config_get_instance (), "Seat:*", "allow-guest"))
+-        config_set_boolean (config_get_instance (), "Seat:*", "allow-guest", TRUE);
++        config_set_boolean (config_get_instance (), "Seat:*", "allow-guest", FALSE);
+     if (!config_has_key (config_get_instance (), "Seat:*", "greeter-allow-guest"))
+         config_set_boolean (config_get_instance (), "Seat:*", "greeter-allow-guest", TRUE);
+     if (!config_has_key (config_get_instance (), "Seat:*", "greeter-show-remote-login"))
+--- a/data/lightdm.conf
++++ b/data/lightdm.conf
+@@ -112,7 +112,7 @@
  #greeter-show-remote-login=true
  #user-session=default
+ #allow-user-switching=true
 -#allow-guest=true
 +#allow-guest=false
  #guest-session=
diff --git a/testing/lightdm/lightdm.initd b/testing/lightdm/lightdm.initd
index 5ecac484c2..6de51487e5 100755
--- a/testing/lightdm/lightdm.initd
+++ b/testing/lightdm/lightdm.initd
@@ -1,15 +1,15 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend() {
 	need localmount dbus
 }
 
-description="Lightweigh display manager"
-command="/usr/sbin/lightdm"
+description="Lightweight Display Manager"
+command="/usr/bin/lightdm"
 command_background="yes"
-pidfile="/var/run/lightdm.pid"
+pidfile="/run/lightdm.pid"
 
 start_pre() {
-	checkpath --owner lightdm:lightdm --directory /var/run/lightdm
+	checkpath --owner lightdm:lightdm --directory /run/lightdm
 }
 
diff --git a/testing/lightdm/musl-is-linux.patch b/testing/lightdm/musl-is-linux.patch
index d0a627c63c..697eff2470 100644
--- a/testing/lightdm/musl-is-linux.patch
+++ b/testing/lightdm/musl-is-linux.patch
@@ -1,6 +1,6 @@
---- ./tests/src/libsystem.c.orig
-+++ ./tests/src/libsystem.c
-@@ -205,7 +205,7 @@
+--- a/tests/src/libsystem.c
++++ b/tests/src/libsystem.c
+@@ -213,7 +213,7 @@
      return g_strdup (path);
  }
  
diff --git a/testing/lightdm/musl-language.patch b/testing/lightdm/musl-language.patch
index 8908bbc511..442e7fb9d5 100644
--- a/testing/lightdm/musl-language.patch
+++ b/testing/lightdm/musl-language.patch
@@ -1,34 +1,36 @@
---- ./liblightdm-gobject/language.c.orig
-+++ ./liblightdm-gobject/language.c
-@@ -224,6 +224,7 @@
+--- a/liblightdm-gobject/language.c
++++ b/liblightdm-gobject/language.c
+@@ -210,6 +210,7 @@
  
      if (!priv->name)
      {
-+#if HAVE_LC_IDENTIFICATION
-         gchar *locale = get_locale_name (priv->code);
++	#if HAVE_LC_IDENTIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
          if (locale)
          {
-@@ -238,6 +239,7 @@
+@@ -223,6 +224,8 @@
+ 
              setlocale (LC_ALL, current);
          }
++	#endif
++
          if (!priv->name)
-+#endif
          {
-             gchar **tokens = g_strsplit_set (priv->code, "_.@", 2);
-             priv->name = g_strdup (tokens[0]);
-@@ -267,6 +269,7 @@
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2);
+@@ -250,6 +253,7 @@
  
      if (!priv->territory && strchr (priv->code, '_'))
      {
-+#if HAVE_LC_IDENTITIFICATION
-         gchar *locale = get_locale_name (priv->code);
++	#if HAVE_LC_IDENTITIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
          if (locale)
          {
-@@ -281,6 +284,7 @@
+@@ -263,6 +267,8 @@
+ 
              setlocale (LC_ALL, current);
          }
++	#endif
++
          if (!priv->territory)
-+#endif
          {
-             gchar **tokens = g_strsplit_set (priv->code, "_.@", 3);
-             priv->territory = g_strdup (tokens[1]);
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3);
diff --git a/testing/lightdm/musl-updwtmpx.patch b/testing/lightdm/musl-updwtmpx.patch
index 106e366e16..1b21a46774 100644
--- a/testing/lightdm/musl-updwtmpx.patch
+++ b/testing/lightdm/musl-updwtmpx.patch
@@ -1,6 +1,6 @@
---- ./src/session-child.c.orig
-+++ ./src/session-child.c
-@@ -198,8 +198,8 @@
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -193,8 +193,8 @@
  }
  
  /* GNU provides this but we can't rely on that so let's make our own version */
@@ -10,4 +10,4 @@
 +updwtmpx (const char *wtmp_file, const struct utmpx *ut)
  {
      struct utmp u;
- 
+     memset (&u, 0, sizeof (u));