Skip to content

Commit

Permalink
Merge pull request #1000 from mariux64/update-polkit-from-0.113+-to-0…
Browse files Browse the repository at this point in the history
….115

Update polkit from 0.113+ to 0.115
  • Loading branch information
donald authored Jan 14, 2019
2 parents 5ceb56c + 2f8431d commit 02b3e8d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 13 deletions.
4 changes: 3 additions & 1 deletion icu4c-53.1-1.bee → icu4c.be0
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/env beesh

# BEE_VERSION icu4c-63.1-0

#neu gebaut wegen neuen gcc und firefox
#SRCURL[0]="http://download.icu-project.org/files/icu4c/4.2.1/icu4c-4_2_1-src.tgz"
SRCURL[0]="http://download.icu-project.org/files/icu4c/53.1/icu4c-53_1-src.tgz"
SRCURL[0]="http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz"

build_in_sourcedir

Expand Down
16 changes: 7 additions & 9 deletions js.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION js-38.2.1-0
# BEE_VERSION js-52.2.1gnome1-0

## 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.)
Expand All @@ -9,13 +9,13 @@
## 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.

SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/mozjs/mozjs-${PKGVERSION}.rc0.tar.bz2"
SRCURL[0]="http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${PKGVERSION}.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=(/src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch)
# PATCHURL+=()

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
Expand All @@ -38,6 +38,7 @@ SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/mozjs/mozjs-${PKGVERSION}.rc0

sourcesubdir_append js/src

BEE_BUILDTYPE=autotools

###############################################################################
## Change the default (auto-detected) steps to
Expand All @@ -49,17 +50,14 @@ sourcesubdir_append js/src
# bee_extract "${@}"
#}

mee_patch() {
# Work around sourcesubdir_append and paths in patch
start_cmd cd ../.. ; patch -N -p1 -i /src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch
bee_patch "${@}"
}
#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
--with-intl-api \
--with-system-zlib \
--with-system-ffi \
--with-system-nspr \
--with-system-icu \
--enable-threadsafe \
Expand Down
26 changes: 23 additions & 3 deletions polkit.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION polkit-0.113_lfs-0
# BEE_VERSION polkit-0.115-0

## 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.)
Expand All @@ -9,13 +9,13 @@
## 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.

SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/polkit/polkit-0.113+git_2919920+js38.tar.xz"
SRCURL[0]=" https://www.freedesktop.org/software/polkit/releases/polkit-${PKGVERSION}.tar.gz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=()
PATCHURL+=(/src/mariux/patches/polkit-0.115-security_patch-2.patch)

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
Expand Down Expand Up @@ -68,6 +68,26 @@ mee_configure() {
#}
## by default this may be 'make install DESTDIR="${D}"'

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
EOF
}

###############################################################################
##
## Additional hints:
Expand Down

0 comments on commit 02b3e8d

Please sign in to comment.