Merge pull request #2661 from mariux64/fix-polkit

polkit: bugfix and install

polkit.be0

@@ -1,54 +1,20 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION polkit-0.115-2
-
-## this file was created by bee init and should be executed to build a
-## bee-package. (Additional hints are located at the end of this file.)
-
-###############################################################################
-## The source URL(s) define the location of the sources that will be
-## downloaded. Version variables may be used to simplify reuse of this bee-file.
+# BEE_VERSION polkit-0.115-3
 
 # orig https://www.freedesktop.org/software/polkit/releases/polkit-${PKGVERSION}.tar.gz
 SRCURL[0]="https://beehive.molgen.mpg.de/f03b055d6ae5fc8eac76838c7d83d082/polkit-0.115.tar.gz"
 
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
-
 PATCHURL+=("https://beehive.molgen.mpg.de/252c1b18ba86a7b05840e992321f4639/polkit-0.115-security_patch-2.patch")
 PATCHURL+=("https://beehive.molgen.mpg.de/bcf14dcb31568b749c4d163cf8878241/0001-GHSL-2021-074-authentication-bypass-vulnerability-in.patch")
 PATCHURL+=("https://beehive.molgen.mpg.de/3aa2c730edd4db0b4028a9b8fb887163/polkit-0.115-cve-2021-4034.patch")
 
-###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be built
-## outside the source directory and needs to be built inside the source
-## directory.
-
 # build_in_sourcedir
 
-###############################################################################
-## bee cannot detect buildtypes specified in subdirectories.
-## Sometimes packages "hide" the real sources in a subdirectory named
-## 'src' or 'cmake' or ..
-## use 'sourcesubdir_append' to specify this directory if known.
-
 # sourcesubdir_append src
 
 LIBEXECDIR=/usr/lib/polkit-1
 
-###############################################################################
-## Change the default (auto-detected) steps to
-## extract, patch, configure/setup, build and install the software.
-## Make sure the mee_install function does install everything to the
-## image directory "${D}"
-
 #mee_extract() {
 #    bee_extract "${@}"
 #}
@@ -58,53 +24,34 @@ LIBEXECDIR=/usr/lib/polkit-1
 #}
 
 mee_configure() {
+    echo "" >${S}/po/LINGUAS
+
     bee_configure \
-        --disable-static
+        --disable-static \
+        --disable-libsystemd-login \
+        --disable-libelogind
 }
 
 #mee_build() {
 #    bee_build
 #}
 
-#mee_install() {
-#    bee_install
-#}
-## by default this may be 'make install DESTDIR="${D}"'
+mee_install() {
+    bee_install
 
-mee_install_post() {
     rm -v ${D}/etc/polkit-1/rules.d/50-default.rules
 
     # If you have built Polkit with Linux PAM support, you need to modify the
     # default PAM configuration file which was installed by default to get
     # Polkit to work correctly with BLFS. Issue the following commands as the
     # root user to create the configuration file for Linux PAM:
 
-    start_cmd cat > /etc/pam.d/polkit-1 << "EOF"
-	# Begin /etc/pam.d/polkit-1
-
-	auth     include        system-auth
-	account  include        system-account
-	password include        system-password
-	session  include        system-session
-
-	# End /etc/pam.d/polkit-1
+    start_cmd cat > ${D}/etc/pam.d/polkit-1 << "EOF"
+        #%PAM-1.0
+
+        auth       include      system-auth
+        account    include      system-auth
+        password   include      system-auth
+        session    include      system-auth
 EOF
 }
-
-###############################################################################
-##
-## Additional hints:
-##
-## The name of this bee-file should follow the following naming convention:
-##     pkgname-pkgversion-pkgrevision.bee
-##
-## You may remove all comments as long as SRCURL[0] is set.
-##
-## Everything in this file will be executed in a bash environment.
-##
-## Build the package by executing
-##     './pkg-version-N.bee' or
-##     'beesh ./pkg-version-N.bee'
-##
-## see http://beezinga.org/
-##