From c68193dc81c5d166c9ec680732dd5445584cd544 Mon Sep 17 00:00:00 2001 From: hugo Date: Tue, 16 Feb 2010 04:39:37 +0000 Subject: [PATCH] Re-installation HAL avec modules optionels (polkit, ConsoleKit, PolicyKit) --- packages-list | 10 +-- stage3/cis-mysql | 1 + stage3/cis-openssh | 4 +- stage4/cis-emacs | 6 +- stage4/cis-hal | 51 ++++++++++++++- stage3/cis-polkit => stage4/cis-policykit | 8 +-- {stage3 => stage4}/cis-polkit | 1 + stage4/cis-xterm | 2 + stage4/packages-update | 10 +++ stage4/resources/ColorGNU.xpm | 76 ----------------------- stage4/resources/{ => emacs}/emacsrc | 0 stage4/stage4-install | 20 +++++- 12 files changed, 95 insertions(+), 94 deletions(-) copy stage3/cis-polkit => stage4/cis-policykit (75%) rename {stage3 => stage4}/cis-polkit (95%) delete mode 100644 stage4/resources/ColorGNU.xpm rename stage4/resources/{ => emacs}/emacsrc (100%) diff --git a/packages-list b/packages-list index c11ef04..24c345f 100644 --- a/packages-list +++ b/packages-list @@ -38,6 +38,7 @@ CDRDAO="cdrdao-1.2.2" CKERMIT="ckermit-8.0.211" CLAMAV="clamav-0.93.3" CLOOG_PPL="cloog-ppl-0.15.7" +CONSOLEKIT="ConsoleKit-0.4.1" COREUTILS="coreutils-7.6" CPIO="cpio-2.9" CUPS="cups-1.1.23" @@ -66,7 +67,7 @@ DVDRWTOOLS="dvd+rw-tools-7.1" E2FSPROGS="e2fsprogs-1.41.9" EASYTAG="easytag-2.1" ED="ed-1.4" -EGGDBUS="eggdbus-0.5" +EGGDBUS="eggdbus-0.6" EGLIBC="eglibc-2.10.1" EMACS="emacs-23.1" ESOUND="esound-0.2.37" @@ -205,8 +206,8 @@ GMP="gmp-4.3.1" GUILE="guile-1.8.7" GZIP="gzip-1.3.12" -HAL="hal-0.5.12" -HAL_INFO="hal-info-20090414" +HAL="hal-0.5.14" +HAL_INFO="hal-info-20091130" HELP2MAN="help2man-1.36.4" HICOLOR_ICON_THEME="hicolor-icon-theme-0.11" HTTPD="httpd-2.2.8" # Apache @@ -337,7 +338,8 @@ PERL_MOD_URI="URI-1.52" PERL_MOD_NET_DNS="Net-DNS-0.66" PHP="php-5.2.6" PIXMAN="pixman-0.17.4" -POLKIT="polkit-0.94" +POLKIT="polkit-0.96" +POLICYKIT="PolicyKit-0.9" POPPLER="poppler-0.12.3" PKG_CONFIG="pkg-config-0.23" POPT="popt-1.15" diff --git a/stage3/cis-mysql b/stage3/cis-mysql index 799f74b..7256041 100755 --- a/stage3/cis-mysql +++ b/stage3/cis-mysql @@ -29,6 +29,7 @@ cd ${LFS_TMP}/${1} --with-plugins=innobase,myisam \ --with-extra-charsets=all \ --with-ssl +make make benchdir_root=/tmp/mysql-bench install rm -rf /tmp/mysql cd /usr/lib diff --git a/stage3/cis-openssh b/stage3/cis-openssh index 078ea38..1e2d5e2 100755 --- a/stage3/cis-openssh +++ b/stage3/cis-openssh @@ -40,8 +40,8 @@ sed -i -e "s!^#PermitRootLogin.*!PermitRootLogin no!g" /etc/ssh/sshd_config # Enabling X11 forwarding sed -i -e "s!^#X11Forwarding.*!X11Forwarding yes!g" /etc/ssh/sshd_config -# Setting MaxAuthTries to 1 -sed -i -e "s!^#MaxAuthTries.*!MaxAuthTries 1!g" /etc/ssh/sshd_config +# Setting MaxAuthTries to 2 +sed -i -e "s!^[#]*MaxAuthTries.*!MaxAuthTries 3!g" /etc/ssh/sshd_config install -v -m740 ${SCRDIR}/bootscripts/sshd /etc/rc.d/init.d bootscript_add_rc3 sshd 25 70 diff --git a/stage4/cis-emacs b/stage4/cis-emacs index 82e5b53..c008cc5 100755 --- a/stage4/cis-emacs +++ b/stage4/cis-emacs @@ -20,12 +20,12 @@ make bootstrap make install ldconfig -install -m644 ${SCRDIR}/resources/emacsrc /etc/skel/.emacs -install -m644 ${SCRDIR}/resources/emacsrc /root/.emacs +install -m644 ${SCRDIR}/resources/emacs/emacsrc /etc/skel/.emacs +install -m644 ${SCRDIR}/resources/emacs/emacsrc /root/.emacs LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp install -v -m644 -d ${LOCAL_SITE_LIST} -install -m644 ${SCRDIR}/resources/buffer-cycle.el ${LOCAL_SITE_LIST} +install -m644 ${SCRDIR}/resources/emacs/buffer-cycle.el ${LOCAL_SITE_LIST} exit $? diff --git a/stage4/cis-hal b/stage4/cis-hal index e113236..c4b4955 100755 --- a/stage4/cis-hal +++ b/stage4/cis-hal @@ -1,4 +1,4 @@ -1#!/bin/sh +#!/bin/sh set -o errexit # First argument of this script is the package name. @@ -26,7 +26,7 @@ cd ${LFS_TMP}/${PACKAGE}-build --sysconfdir=/etc \ --libexecdir=/usr/lib/hal \ --localstatedir=/var \ - --disable-policy-kit \ + --with-udev-prefix=/etc \ ${CONFIGURE_OPTS} make make install @@ -40,6 +40,53 @@ install -v -m740 ${SCRDIR}/bootscripts/hald /etc/rc.d/init.d # script-name start stop bootscript_add_rc3 hald 93 19 +# The default setup for HAL is to allow only certain users to invoke methods +# such as Mount(). These are the root user and the user determined to be at the +# active console using pam_console. If you are not set up to use +# Linux-PAM-1.1.1 and pam_console, create a group that is allowed to invoke HAL +# methods with the following commands: +hv_groupadd -g 61 halusers +cat > /etc/dbus-1/system.d/halusers.conf << "EOF" + + + + + + + + + + + + +EOF + +# Now add the users you would like to the halusers group to use HAL: +usermod -a -G halusers ${REGUSER} + +# With the above configuration in place, authorized users now have the ability +# to unmount disk partitions mounted at non-standard locations such as /pub. +# If you'd like to restrict this policy to only drives which are considered +# removable or hotpluggable, add the following configuration file as the root user: +cat > /etc/hal/fdi/policy/no-fixed-drives.fdi << "EOF" + + + + + + + + + true + + + + +EOF + # If the system-wide D-BUS daemon was running during the # installation of HAL, ensure you stop and restart the # D-BUS daemon before attempting to start the hald daemon. diff --git a/stage3/cis-polkit b/stage4/cis-policykit similarity index 75% copy from stage3/cis-polkit copy to stage4/cis-policykit index e3fcbfc..1fa375a 100755 --- a/stage3/cis-polkit +++ b/stage4/cis-policykit @@ -1,7 +1,8 @@ #!/bin/sh set -o errexit -# First argument of this script is the package name +# First argument of this script is the package name. +# Remaining arguments are additional configure options. # Reading system configuration informations, functions and package versions. source ../sysinfos @@ -15,9 +16,7 @@ CONFIGURE_OPTS=${*} # Applying patches (if any) apply_patches ${PACKAGE} -# It is a requirement to have a dedicated user and group for polkit to function -# correctly: -hv_groupadd -fg 27 polkituser +hv_groupadd -g 27 polkituser hv_useradd -c Policy-Kit-Daemon-User -d /dev/null -u 27 \ -g polkituser -s /bin/false polkituser @@ -25,6 +24,7 @@ cd ${LFS_TMP}/${PACKAGE}-build ../${PACKAGE}/configure \ --prefix=/usr \ --sysconfdir=/etc \ + --libexecdir=/usr/lib/PolicyKit \ --localstatedir=/var \ ${CONFIGURE_OPTS} make diff --git a/stage3/cis-polkit b/stage4/cis-polkit similarity index 95% rename from stage3/cis-polkit rename to stage4/cis-polkit index e3fcbfc..6c7a45f 100755 --- a/stage3/cis-polkit +++ b/stage4/cis-polkit @@ -25,6 +25,7 @@ cd ${LFS_TMP}/${PACKAGE}-build ../${PACKAGE}/configure \ --prefix=/usr \ --sysconfdir=/etc \ + --libexecdir=/usr/lib/polkit-1 \ --localstatedir=/var \ ${CONFIGURE_OPTS} make diff --git a/stage4/cis-xterm b/stage4/cis-xterm index c2568a6..7165fe2 100755 --- a/stage4/cis-xterm +++ b/stage4/cis-xterm @@ -22,6 +22,8 @@ echo -e '\tkbs=\\177,' >>terminfo cd ${LFS_TMP}/${PACKAGE}-build TERMINFO=/usr/lib/terminfo ../${PACKAGE}/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ --enable-luit \ --enable-wide-chars \ --with-app-defaults=${XORG_PREFIX}/share/X11/app-defaults \ diff --git a/stage4/packages-update b/stage4/packages-update index 42f42c2..01702cc 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -17,6 +17,16 @@ export RCMD_NO_EXIT=1 update_packages_init + + + +fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi" +fpkg_gnome ${GOBJECT_INSTROSPECTION} +fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases" +fpkg ${POLKIT} "http://hal.freedesktop.org/releases" +fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" +fpkg ${POLICYKIT} "http://hal.freedesktop.org/releases" + XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}" BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg diff --git a/stage4/resources/ColorGNU.xpm b/stage4/resources/ColorGNU.xpm deleted file mode 100644 index 6e069f6..0000000 --- a/stage4/resources/ColorGNU.xpm +++ /dev/null @@ -1,76 +0,0 @@ -/* XPM */ -static char * ColorGNU_xpm[] = { -"48 48 25 1", -" c None", -". c #965871C65144", -"X c #DF7DAEBA8617", -"o c #965861855144", -"O c #5144410330C2", -"+ c #000000000000", -"@ c #861771C65144", -"# c #EFBEEFBEEFBE", -"$ c #9E79A2899E79", -"% c #618561854103", -"& c #9E79A2898617", -"* c #AEBAA2898617", -"= c #9E79A28971C6", -"- c #861771C64103", -"; c #9E79AEBA8617", -": c #9E79AEBA71C6", -"> c #DF7DBEFB71C6", -", c #71C661855144", -"< c #DF7DBEFB8617", -"1 c #DF7DAEBA71C6", -"2 c #4103410330C2", -"3 c #618571C64103", -"4 c #514441032081", -"5 c #514430C230C2", -"6 c #410341032081", -" .Xo..OO+OO", -" O O . ..@O.O+OO.", -" +# ++#####$##O% O ....@oOO+OOoO", -" O# O###OO$#+###++O$$O+++@OO&OOOOO.", -" +#O O+$###*O+OOO####*#++OOOO++*=+OOOo-", -" %#O ###+##;*+.@#O#O####$O+OO+&;*+OO.O.", -" O#$ +####*=*OO@o@#O$##=*+OOOO+=*=++OOo@", -" ;O#O ##O#&;#+.@X@.OO%O##:#+OOO#&:&+OO.@.", -" *O#+ +$###=*:O.o>X.oO,###*O+++O#:*O+OOOo-", -" :&#+ +#####O:##.X.o+++*:##*%,=*:*++OO.O-", -" %&###$+###;*:&;O+.@X5++45+O-o+#%,%+++OO+O++-", -" &#*:&;*:&O +.+O2O2.@O2+2O+O+O@+$O+++++++.+++.", -" O=O=O=OO $+.65456545654+++++@+%+O+OOXo@+OO@", -" O3O%O +.O+++O2O+++O+#O++.OXO.OX@+++++O.", -" 4++5454++O+O-o#oO++++++++++++++o-", -" O+.@.+++++O+O+.+++++++++++++++OO.", -" 4++o@+++456o+oOo++6++++++++++oOO@", -" ++O.<.O++O@.@.@.+O+O+++O+O+O2O2.@.", -" 4o.X>o+5-o1X>o.O+54++++O+5454oOo-", -" O@.XOo>X1o-+O.+++++O+5454o-o.X-", -" ..2.@X", -" ", -" @.+O2O2O2OX+@++ $+O+O@.@.@X", -" O$XXXXXX+ ++2.O.@.@X", -" $O+$+@oO+ ++56oOo@X@", -" O++OO++ ++2O2.@.@X", -" o.+OO$ O+545-o.o-", -" + ++O2O2.@.", -" $ ++654oOo@", -" +++2O2.@X"}; diff --git a/stage4/resources/emacsrc b/stage4/resources/emacs/emacsrc similarity index 100% rename from stage4/resources/emacsrc rename to stage4/resources/emacs/emacsrc diff --git a/stage4/stage4-install b/stage4/stage4-install index 73e3ad2..413f20e 100755 --- a/stage4/stage4-install +++ b/stage4/stage4-install @@ -74,14 +74,14 @@ install_xorg_modules ${XORG_UTIL} ipkg_ac ${LIBXAU} ${XORG_CONFIG} ipkg_ac ${LIBXDMCP} ${XORG_CONFIG} install_xorg_modules ${XORG_LIB} -ipkg_cust ${LESSTIF} cis-lesstif "\ +ipkg_cust ${LESSTIF} cis-lesstif \ --sysconfdir=/etc/X11 \ --disable-debug \ --disable-build-tests \ --enable-production \ --with-xdnd \ --x-includes=$XORG_PREFIX/include \ - --x-libraries=$XORG_PREFIX/lib" + --x-libraries=$XORG_PREFIX/lib ipkg_ac ${XBITMAPS} ${XORG_CONFIG} ipkg_ac ${LIBPTHREAD_STUBS} ipkg_ac ${LIBDRM} --enable-udev @@ -94,9 +94,23 @@ ipkg_ac ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg ipkg_ac ${LUIT} ${XORG_CONFIG} ipkg_ac ${PIXMAN} +ipkg_ac ${LIBFFI} ipkg_cust ${DBUS} cis-dbus ipkg_cust ${GLIB} cis-glib --with-pcre=system -ipkg_ac ${DBUS_GLIB} "--disable-tests --disable-dependency-tracking --libexecdir=/usr/lib/dbus-1.0/dbus-1" +ipkg_ac ${GOBJECT_INSTROSPECTION} +ipkg_ac ${DBUS_GLIB} \ + --disable-tests \ + --disable-dependency-tracking \ + --libexecdir=/usr/lib/dbus-1.0/dbus-1 +ipkg_ac ${EGGDBUS} + +ipkg_cust ${POLKIT} cis-polkit +ipkg_ac_nb ${CONSOLEKIT} \ + --libexecdir=/usr/lib/ConsoleKit \ + --localstatedir=/var \ + --enable-pam-module +ipkg_cust ${POLICYKIT} cis-policykit + ipkg_cust ${HAL} cis-hal ipkg_ac ${HAL_INFO} -- 2.20.1