Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 1cad412 + 3ce959a commit 7c48fe8448066b374de0f8b4475c2ec09bca5e0e @beanpole135 beanpole135 committed Oct 1, 2013
View
12 src-qt4/pc-bootconfig/mainUI.ui
@@ -6,13 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
- <width>640</width>
- <height>262</height>
+ <width>638</width>
+ <height>260</height>
</rect>
</property>
<property name="windowTitle">
<string>PC-BSD Bootup Configuration</string>
</property>
+ <property name="windowIcon">
+ <iconset resource="pc-bootconfig.qrc">
+ <normaloff>:/pc-bootconfig.png</normaloff>:/pc-bootconfig.png</iconset>
+ </property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -386,8 +390,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>640</width>
- <height>20</height>
+ <width>638</width>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
View
31 src-qt4/pc-bootconfig/pc-bootconfig.qrc
@@ -1,17 +1,18 @@
<RCC>
- <qresource>
- <file>icons/undo.png</file>
- <file>icons/gear.png</file>
- <file>icons/save.png</file>
- <file>icons/folder.png</file>
- <file>icons/minus.png</file>
- <file>icons/add.png</file>
- <file>icons/close.png</file>
- <file>icons/copy.png</file>
- <file>icons/new.png</file>
- <file>icons/rename.png</file>
- <file>icons/star.png</file>
- <file>icons/sync.png</file>
- <file>icons/plus.png</file>
- </qresource>
+ <qresource prefix="/">
+ <file>icons/undo.png</file>
+ <file>icons/gear.png</file>
+ <file>icons/save.png</file>
+ <file>icons/folder.png</file>
+ <file>icons/minus.png</file>
+ <file>icons/add.png</file>
+ <file>icons/close.png</file>
+ <file>icons/copy.png</file>
+ <file>icons/new.png</file>
+ <file>icons/rename.png</file>
+ <file>icons/star.png</file>
+ <file>icons/sync.png</file>
+ <file>icons/plus.png</file>
+ <file>pc-bootconfig.png</file>
+ </qresource>
</RCC>
View
0 ...olpanel/items/system/pc-updategui.desktop → ...panel/items/software/pc-updategui.desktop
File renamed without changes.
View
2 src-qt4/pc-controlpanel/items/system/pc-gdmconf.desktop
@@ -5,7 +5,7 @@ Comment=
Exec=pc-su pc-gdmconf
TryExec=/usr/local/bin/pc-gdmconf
Keywords="gdm,login,login window,auto login,autologin,xdmcp,remote login,login timout"
-Icon=/usr/local/share/pcbsd/icons/pc-dmconf.png
+Icon=/usr/local/share/pcbsd/icons/pc-gdmconf.png
StartupNotify=true
Terminal=false
TerminalOptions=
View
2 src-qt4/pc-updategui/main.cpp
@@ -19,7 +19,7 @@ int main( int argc, char ** argv )
QString langCode = mylocale.name();
if ( ! QFile::exists( PREFIX + "/share/pcbsd/i18n/UpdateGUI_" + langCode + ".qm" ) )
langCode.truncate(langCode.indexOf("_"));
- translator.load( QString("UpdateGUI_") + langCode, PREFIX + "/share/pcbsd/i18n/" );
+ translator.load( QString("UpdateGui_") + langCode, PREFIX + "/share/pcbsd/i18n/" );
a.installTranslator( &translator );
qDebug() << "Locale:" << langCode;
View
2 src-qt4/port-files/pkg-plist
@@ -416,7 +416,6 @@ share/pcbsd/pc-controlpanel/items/system/lxde-lxtask.desktop
share/pcbsd/pc-controlpanel/items/system/pcusermanager.desktop
share/pcbsd/pc-controlpanel/items/system/ksystemlog.desktop
share/pcbsd/pc-controlpanel/items/system/about.desktop
-share/pcbsd/pc-controlpanel/items/system/pc-updategui.desktop
share/pcbsd/pc-controlpanel/items/system/pc-adsldap.desktop
share/pcbsd/pc-controlpanel/items/system/webmin.desktop
share/pcbsd/pc-controlpanel/items/system/pc-sysmanager.desktop
@@ -432,6 +431,7 @@ share/pcbsd/pc-controlpanel/items/tools/pbi-kbackup.desktop
share/pcbsd/pc-controlpanel/items/tools/warden.desktop
share/pcbsd/pc-controlpanel/items/tools/lifepreserver.desktop
share/pcbsd/pc-controlpanel/items/tools/flash-player-properties.desktop
+share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop
share/pcbsd/pc-controlpanel/items/software/pbi-winecfg.desktop
share/pcbsd/pc-controlpanel/items/software/pbi-q4wine.desktop
share/pcbsd/pc-controlpanel/items/software/pbi-kports.desktop
View
6 src-sh/libsh/functions.sh
@@ -242,7 +242,8 @@ get_file_from_mirrors()
_time=`expr $_time + 1`
done
- _err="`cat ${_eFile}`"
+ _err="`cat ${_eFile} 2>/dev/null`"
+ if [ -z "$_err" ] ; then _err="0"; fi
rm ${_eFile} 2>/dev/null
if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
unset FETCH_PID
@@ -303,7 +304,8 @@ get_file() {
_time=`expr $_time + 2`
done
- _err="`cat ${_eFile}`"
+ _err="`cat ${_eFile} 2>/dev/null`"
+ if [ -z "$_err" ] ; then _err="0"; fi
rm ${_eFile} 2>/dev/null
if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
unset FETCH_PID
View
2 src-sh/pbi-manager/pbi-manager
@@ -7516,7 +7516,7 @@ getZFSTank() {
}
# Source our shared PCBSD functions
-if [ -z "$ALTPROGPREFIX" ] ; then
+if [ -n "$ALTPROGPREFIX" ] ; then
. ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh
else
. /usr/local/share/pcbsd/scripts/functions.sh
View
33 src-sh/pbi-manager10/install.sh
@@ -5,7 +5,7 @@
verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`"
if [ $verCheck -lt 1000000 ] ; then
# This version is for FreeBSD >= 10
- exit 0
+ #exit 0
fi
DEFAULT="/usr/local"
@@ -52,22 +52,22 @@ mkdir -p ${LB}/man/man1 >/dev/null 2>/dev/null
for i in `ls man1/`
do
rm ${LB}/man/man1/${i}.gz >/dev/null 2>/dev/null
- cp man1/${i} ${LB}/man/man1/${i}
+ gzip -c man1/${i} > ${LB}/man/man1/${i}.gz
done
mkdir -p ${LB}/man/man5 >/dev/null 2>/dev/null
for i in `ls man5/`
do
rm ${LB}/man/man5/${i}.gz >/dev/null 2>/dev/null
- cp man5/${i} ${LB}/man/man5/${i}
+ gzip -c man5/${i} > ${LB}/man/man5/${i}.gz
done
mkdir -p ${LB}/man/man8 >/dev/null 2>/dev/null
for i in `ls man8/`
do
rm ${LB}/man/man8/${i}.gz >/dev/null 2>/dev/null
- cp man8/${i} ${LB}/man/man8/${i}
+ gzip -c man8/${i} > ${LB}/man/man8/${i}.gz
done
if [ -d "${LB}/share/pbi-manager" ] ; then rm -rf "${LB}/share/pbi-manager" ; fi
@@ -82,9 +82,9 @@ cp ${DIR}/icons/default.png ${LB}/share/pbi-manager/icons
cp ${DIR}/icons/patch.png ${LB}/share/pbi-manager/icons
# If this is a new install, add the PC-BSD master repo
-if [ ! -d "/var/db/pbi/keys" ] ; then
- pbi_addrepo ${DIR}/repo/pcbsd.rpo
-fi
+#if [ ! -d "/var/db/pbi/keys" ] ; then
+# pbi_addrepo ${DIR}/repo/pcbsd.rpo
+#fi
# Copy the default PC-BSD repo file
cp ${DIR}/repo/pcbsd.rpo ${LB}/share/pbi-manager/pcbsd.rpo
@@ -96,20 +96,18 @@ ${LB}/sbin/pbi_info >/dev/null 2>/dev/null
cp ${DIR}/rc.d/pbid ${LB}/etc/rc.d/pbid
cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf
-if [ ! -d "/usr/pbi" ] ; then mkdir /usr/pbi ; fi
-
# Create the wrapper binary
cd ${DIR}/wrapper
if [ `uname -m` = "amd64" ] ; then
# Build 32bit wrapper
echo "Building i386 wrapper..."
- rm .pbiwrapper >/dev/null 2>/dev/null
+ rm pbiwrapper >/dev/null 2>/dev/null
make clean
make DEFINES="-mtune=i386 -march=i386 -m32"
make install
- chown root:wheel /usr/pbi/.pbiwrapper
- chmod 644 /usr/pbi/.pbiwrapper
- mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386
+ chown root:wheel pbiwrapper
+ chmod 644 pbiwrapper
+ mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386
else
touch ${LB}/share/pbi-manager/.pbiwrapper-i386
fi
@@ -118,10 +116,11 @@ fi
echo "Building `uname -m` wrapper..."
DEFINES=""
export DEFINES
-rm .pbiwrapper >/dev/null 2>/dev/null
+rm pbiwrapper >/dev/null 2>/dev/null
make clean
make DEFINES=""
make install DEFINES=""
-chown root:wheel /usr/pbi/.pbiwrapper
-chmod 644 /usr/pbi/.pbiwrapper
-mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m`
+chown root:wheel pbiwrapper
+chmod 644 pbiwrapper
+mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m`
+cp ldconfig ${LB}/share/pbi-manager/ldconfig-pbi
View
118 src-sh/pbi-manager10/pbi-manager
@@ -3527,9 +3527,6 @@ do_pbi_create_backup() {
# Make the header archive
mk_header_file
- # Remove the new headerdir
- rm -rf "$PBI_HEADERDIR"
-
# Now finish up and make the resulting PBI file
mk_output_pbi
@@ -3551,7 +3548,12 @@ do_pbi_create() {
if [ "`basename $0`" = "pbi_makeport" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then
- PBI_STAGEDIR="/usr/local"
+ #PBI_STAGEDIR="/usr/local"
+ # KPM REMOVE ME
+ mk_stage_dir "/usr/local" "move"
+
+ # Check if we created a linux app, and need to copy files for it
+ auto_copy_linuxbase
else
mk_stage_dir
fi
@@ -3575,11 +3577,11 @@ do_pbi_create() {
mk_header_dir
save_pbi_details_to_header
mk_header_file
- rm_header_dir
mk_output_pbi
rm_stage_dir
+ exit 0
}
# Start looping through and creating a hash-list of files
@@ -4047,20 +4049,18 @@ mk_deinstall_script() {
# Create a dir for manipulating header info
mk_header_dir() {
- PBI_HEADERDIR="${PBI_PROGDIRPATH}/.headerdir"
+ PBI_HEADERDIR="${PBI_STAGEDIRMNT}/pbimeta"
if [ -e "${PBI_HEADERDIR}" ] ; then rm -rf "${PBI_HEADERDIR}" ; fi
mkdir -p ${PBI_HEADERDIR}
}
-# Remove the tmp header-dir
-rm_header_dir() {
- PBI_HEADERDIR="${PBI_PROGDIRPATH}/.headerdir"
- if [ -e "${PBI_HEADERDIR}" ] ; then rm -rf "${PBI_HEADERDIR}" ; fi
-}
-
# Create a dir for staging the final archive
mk_stage_dir() {
- local _excOpts=""
+ if [ -n "$1" ] ; then
+ cpDir="$1"
+ else
+ cpDir="${PBI_PROGDIRPATH}"
+ fi
PBI_STAGEDIR="${PBI_PROGDIRPATH}/.stagedir"
echo "Creating Stage Dir: ${PBI_STAGEDIR}"
@@ -4071,6 +4071,15 @@ mk_stage_dir() {
fi
mkdir -p ${PBI_STAGEDIR}
+ mkdir -p ${PBI_STAGEDIR}/local
+ mkdir -p ${PBI_STAGEDIR}/etc
+ mkdir -p ${PBI_STAGEDIR}/pbimeta
+ mkdir -p ${PBI_STAGEDIR}/virtbase
+ mkdir -p ${PBI_STAGEDIR}/linux
+ mkdir -p ${PBI_STAGEDIR}/run
+
+ local _excOpts=""
+
# Build module list of excludes
if [ -n "$PBI_EXCLUDELIST" ] ; then
for excl in $PBI_EXCLUDELIST
@@ -4083,17 +4092,27 @@ mk_stage_dir() {
done
fi
- # Now copy the stagedir
- tar cvf - ${_excOpts} --exclude .stagedir \
+ if [ "$2" = "move" ] ; then
+ mv ${cpDir}/* ${PBI_STAGEDIR}/local
+ else
+ # Now copy the stagedir
+ tar cvf - ${_excOpts} --exclude .stagedir \
--exclude .pkgdb --exclude .ld-elf.hints --exclude make.conf \
--exclude make.conf.bak --exclude .keepports \
- -C "${PBI_PROGDIRPATH}" . 2>/dev/null \
- | tar xvpf - -C ${PBI_STAGEDIR} 2>/dev/null
+ -C "${cpDir}" . 2>/dev/null \
+ | tar xvpf - -C ${PBI_STAGEDIR}/local 2>/dev/null
+ fi
+ cd ${PBI_PROGDIRPATH}
+ PBI_STAGEDIRMNT="${PBI_STAGEDIR}"
+ PBI_STAGEDIR="${PBI_STAGEDIR}/local"
}
# Remove the stagedir
rm_stage_dir() {
+ # If this is in the chroot we can exit and let the parent cleanup
+ if [ "$0" = "pbi_makeport_chroot" ] ; then return; fi
+
cd /
PBI_STAGEDIR="${PBI_PROGDIRPATH}/.stagedir"
if [ -e "${PBI_STAGEDIR}" ] ; then
@@ -4112,15 +4131,20 @@ clean_icons_dir() {
# See if we need to clean the stagedir
clean_stage_dir() {
+
+ if [ -e "${PBI_STAGEDIR}/etc" ] ; then
+ mv ${PBI_STAGEDIR}/etc/* ${PBI_STAGEDIRMNT}/etc/
+ fi
+
if [ "${PBI_USESYSGL}" != "NO" ] ; then
rm ${PBI_STAGEDIR}/lib/libGl.* >/dev/null 2>/dev/null
rm ${PBI_STAGEDIR}/lib/libGL.* >/dev/null 2>/dev/null
rm ${PBI_STAGEDIR}/lib/libGLU.* >/dev/null 2>/dev/null
fi
if [ "${PBI_USESYSFONTS}" != "NO" ] ; then
- rm -rf ${PBI_STAGEDIR}/etc/fonts >/dev/null 2>/dev/null
- rm -rf ${PBI_STAGEDIR}/lib/X11/fonts >/dev/null 2>/dev/null
- rm -rf ${PBI_STAGEDIR}/lib/X11/icons >/dev/null 2>/dev/null
+ rm -rf ${PBI_STAGEDIR}/etc/fonts/* >/dev/null 2>/dev/null
+ rm -rf ${PBI_STAGEDIR}/lib/X11/fonts/* >/dev/null 2>/dev/null
+ rm -rf ${PBI_STAGEDIR}/lib/X11/icons/* >/dev/null 2>/dev/null
fi
}
@@ -4159,7 +4183,7 @@ mk_archive_file() {
PBI_CREATE_ARCHIVE="${PBI_CREATE_OUTDIR}/.PBI.$$.tbz"
if test_tar_lzma ; then _tcmp="J" ; else _tcmp="j" ; fi
echo "Creating compressed archive..."
- tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" ${_excOpts} -C ${PBI_STAGEDIR} . 2>/dev/null
+ tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" ${_excOpts} -C ${PBI_STAGEDIRMNT} . 2>/dev/null
}
# Start creating the header archive
@@ -4272,27 +4296,28 @@ sign_pbi_files() {
done
}
-
# All the pieces are ready, spit out the final PBI file
mk_output_pbi() {
if [ -n "${PBI_PROGICON}" -a -e "${PBI_STAGEDIR}/${PBI_PROGICON}" ] ; then
icon="${PBI_STAGEDIR}/${PBI_PROGICON}"
else
icon="${PBI_DEFAULT_ICON_CHROOT}"
fi
- _pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
+ # Set PBI name all lower-case
+ _pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
outfile="${PBI_CREATE_OUTDIR}/${_pbilow}-${PBI_PROGVERSION}-${ARCH}.pbi"
+
mark1="${PBI_CREATE_OUTDIR}/.pbimark1.$$"
mark2="${PBI_CREATE_OUTDIR}/.pbimark2.$$"
-
echo "
${PBI_SS_ICON}" >$mark1
echo "
${PBI_SS_ARCHIVE}" >$mark2
+
# DO IT, DO IT NOW!!!
- cat ${PBI_HEADER_ARCHIVE} $mark1 ${icon} $mark2 ${PBI_CREATE_ARCHIVE} > ${outfile}
+ cat ${PBI_HEADER_ARCHIVE} $mark1 ${icon} $mark2 ${PBI_CREATE_ARCHIVE} > ${outfile}
sha256 -q ${outfile} > ${outfile}.sha256
echo "Created PBI: ${outfile}"
@@ -6656,6 +6681,8 @@ do_pbi_make() {
if [ "$_err" = "0" -a "${PBI_BUILDONLY}" != "YES" ] ; then
mv ${PBI_CHROOTDIR}/pbiout/*.pbi ${PBI_CREATE_OUTDIR}/
mv ${PBI_CHROOTDIR}/pbiout/*.sha256 ${PBI_CREATE_OUTDIR}/
+ else
+ echo "Error: pbi_makeport_chroot: returned non-0 status!"
fi
# Break here if we are only doing a build
@@ -6697,7 +6724,9 @@ do_pbi_make() {
get_pbi_progversion
# Prune any proto / build specific ports
- start_pbi_prune_ports
+ if [ -z "$PBI_PKGNGBUILD" ] ; then
+ start_pbi_prune_ports
+ fi
# See if we need to run a post make script
run_pbi_postportmake
@@ -6710,7 +6739,7 @@ do_pbi_make() {
mk_auto_ext_linksfile
# Check if we created a linux app, and need to copy files for it
- auto_copy_linuxbase
+ #auto_copy_linuxbase
# Break here if we are only doing a build
if [ "${PBI_BUILDONLY}" = "YES" ] ; then exit_trap; fi
@@ -6790,15 +6819,11 @@ start_postbuild_script()
# Check if we created any linux stuff, and copy it into the correct PREFIX
auto_copy_linuxbase()
{
- echo "Checking for Linux libraries to copy..."
if [ -d "/compat/linux/usr/lib" ] ; then
mkdir ${PBI_PROGDIRPATH}/linuxlib
- echo "Copying /compat/linux/lib -> ${PBI_PROGDIRPATH}/linuxlib"
- tar cvf - -C /compat/linux/lib . 2>/dev/null | \
- tar xvf - -C ${PBI_PROGDIRPATH}/linuxlib 2>/dev/null
- echo "Copying /compat/linux/usr/lib -> ${PBI_PROGDIRPATH}/linuxlib"
- tar cvf - -C /compat/linux/usr/lib . 2>/dev/null | \
- tar xvf - -C ${PBI_PROGDIRPATH}/linuxlib 2>/dev/null
+ echo "Copying /compat/linux -> ${PBI_STAGEDIRMNT}/linux"
+ tar cvf - -C /compat/linux . 2>/dev/null | \
+ tar xvf - -C ${PBI_STAGEDIRMNT}/linux 2>/dev/null
fi
}
@@ -7346,6 +7371,21 @@ do_port_build()
pkg info -e ${pkgName}
if [ $? -eq 0 ] ; then return ; fi
+ # Are we doing a PKGNG build?
+ if [ -n "$PBI_PKGNGBUILD" ] ; then
+ pkg install -y "$_lPortRaw"
+ if [ $? -ne 0 ] ; then
+ exit_err "Failed installing $_lPortRaw"
+ fi
+ return 0
+ fi
+
+ # Lets do old-fashioned build
+
+ # KPM! ##############
+ # We will need to revisit this portion later, see if we can
+ # grab the user / group list from pkgng installed packages
+
# Save any users / groups we need to create later
local pUsers="`make -V USERS -C $_lPort PORTSDIR=${PORTSDIR}`"
local pGroups="`make -V GROUPS -C $_lPort PORTSDIR=${PORTSDIR}`"
@@ -7371,16 +7411,6 @@ do_port_build()
do_port_build "${_port}" >&1 2>&1
done
- # Are we doing a PKGNG build?
- if [ "$PBI_PKGNGBUILD" ] ; then
- pkg install -y "$_lPortRaw"
- if [ $? -ne 0 ] ; then
- exit_err "Failed installing $_lPortRaw"
- fi
- return 0
- fi
-
- # Lets do old-fashioned build
echo "Compiling port: ${_lPort}"
cd ${_lPort}
make rmconfig
View
10 src-sh/pbi-manager10/wrapper/Makefile
@@ -14,7 +14,6 @@ LFLAGS = -Wl,-O1 $(DEFINES)
LIBS = $(SUBLIBS)
AR = ar cqs
RANLIB =
-QMAKE = /usr/local/bin/qmake-qt4
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -40,9 +39,8 @@ OBJECTS_DIR = ./
SOURCES = main.c
OBJECTS = main.o
-MAKE_TARGET = .pbiwrapper
-DESTDIR = /usr/pbi/
-TARGET = .pbiwrapper
+MAKE_TARGET = pbiwrapper
+TARGET = pbiwrapper
first: all
####### Implicit rules
@@ -69,7 +67,6 @@ first: all
all: Makefile $(TARGET)
$(TARGET): $(OBJECTS)
- @$(CHK_DIR_EXISTS) /usr/pbi/ || $(MKDIR) /usr/pbi/
$(CC) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile:
@@ -124,9 +121,6 @@ main.o: main.c
####### Install
install_scripts: first FORCE
- -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/pbi || $(MKDIR) $(INSTALL_ROOT)/usr/pbi/
- -$(INSTALL_FILE) .pbiwrapper $(INSTALL_ROOT)/usr/pbi/.pbiwrapper
- -$(INSTALL_FILE) ldconfig $(INSTALL_ROOT)/usr/pbi/.ldconfig
install: FORCE install_scripts
View
1 src-sh/pc-extractoverlay/desktop-overlay/root/.cshrc
@@ -36,6 +36,7 @@ if ($?prompt) then
set filec
set history = 100
set savehist = 100
+ set autorehash = always
set mail = (/var/mail/$USER)
if ( $?tcsh ) then
bindkey "^W" backward-delete-word
View
1 src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.cshrc
@@ -37,6 +37,7 @@ if ($?prompt) then
set correct = cmd
set filec
set autocorrect
+ set autorehash = always
set filec
set history = 100
set savehist = 100
View
1 src-sh/port-files/pkg-plist
@@ -148,6 +148,7 @@ share/pcbsd/conf/prune-port-files
share/pcbsd/conf/desktop-excludes
share/pcbsd/conf/server-excludes
share/pcbsd/pefs/other
+share/pcbsd/pefs/sshd
share/pcbsd/pefs/system
share/pcbsd/distfiles/desktop-overlay.txz
share/pcbsd/distfiles/port-overlay.txz
View
1 src-sh/xtrafiles/local/bin/enable_user_pefs
@@ -78,3 +78,4 @@ fi
# Copy /etc/pam.d/ template files
cp /usr/local/share/pcbsd/pefs/other /etc/pam.d/other
cp /usr/local/share/pcbsd/pefs/system /etc/pam.d/system
+cp /usr/local/share/pcbsd/pefs/sshd /etc/pam.d/sshd
View
28 src-sh/xtrafiles/local/share/pcbsd/pefs/sshd
@@ -0,0 +1,28 @@
+#
+# $FreeBSD$
+#
+# PAM configuration for the "sshd" service
+#
+
+# auth
+auth sufficient pam_opie.so no_warn no_fake_prompts
+auth requisite pam_opieaccess.so no_warn allow_local
+#auth sufficient pam_krb5.so no_warn try_first_pass
+#auth sufficient pam_ssh.so no_warn try_first_pass
+auth sufficient pam_pefs.so try_first_pass delkeys
+auth required pam_unix.so no_warn try_first_pass
+
+# account
+account required pam_nologin.so
+#account required pam_krb5.so
+account required pam_login_access.so
+account required pam_unix.so
+
+# session
+#session optional pam_ssh.so want_agent
+session optional pam_pefs.so delkeys
+session required pam_permit.so
+
+# password
+#password sufficient pam_krb5.so no_warn try_first_pass
+password required pam_unix.so no_warn try_first_pass

0 comments on commit 7c48fe8

Please sign in to comment.