Permalink
Browse files

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

  • Loading branch information...
2 parents c823860 + 05784db commit d4a3b4cd40db290309cc5e0e63841cebdc9cfb8a Ken Moore committed Oct 3, 2013
@@ -19,7 +19,6 @@ usr/share/me
usr/share/mk
usr/share/man
usr/share/nls
-usr/share/openssl
usr/share/pcvt
usr/share/security
usr/share/sendmail
@@ -188,7 +187,6 @@ usr/bin/objcopy
usr/bin/objdump
usr/bin/objformat
usr/bin/od
-usr/bin/openssl
usr/bin/pagesize
usr/bin/paste
usr/bin/patch
@@ -1,7 +1,7 @@
#include "LPWizard.h"
#include "ui_LPWizard.h"
-LPWizard::LPWizard(QWidget *parent = 0) : QWizard(parent), ui(new Ui::LPWizard){
+LPWizard::LPWizard(QWidget *parent) : QWizard(parent), ui(new Ui::LPWizard){
//Initialize the graphical items
ui->setupUi(this); //load the mainUI.ui file
cancelled = true; //Make sure this is always set by default
@@ -14,7 +14,7 @@ namespace Ui{
class LPWizard : public QWizard{
Q_OBJECT
public:
- explicit LPWizard(QWidget*);
+ explicit LPWizard(QWidget *parent = 0);
~LPWizard();
//Input dataset
@@ -3,6 +3,8 @@
#include <qtsingleapplication.h>
#include <QDebug>
#include <QFile>
+#include <unistd.h>
+#include <sys/types.h>
#include "LPTray.h"
//#include "../config.h"
@@ -1,5 +1,6 @@
#include "mainUI.h"
#include "ui_mainUI.h"
+#include <unistd.h>
mainUI::mainUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::mainUI){
//Initialize the graphical items
@@ -4,6 +4,8 @@
#include "adsldap.h"
#include <QDebug>
#include <QFile>
+#include <unistd.h>
+#include <sys/types.h>
int main( int argc, char ** argv )
{
@@ -4,6 +4,8 @@
#include <QMessageBox>
#include <QDebug>
#include "mainUI.h"
+#include <unistd.h>
+#include <sys/types.h>
#ifndef PREFIX
#define PREFIX QString("/usr/local/")
@@ -29,7 +31,7 @@ int main(int argc, char ** argv)
QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) );
w.show();
//Check for root
- if (0 != geteuid())
+ if (0 != getuid())
{
QMessageBox msg;
msg.setText(w.tr("This application requires administrator privileges for operation."));
@@ -27,6 +27,7 @@
#include "ui_mainwnd.h"
#include "deinfo.h"
#include "../config.h"
+#include <unistd.h>
#include <QFile>
#include <iostream>
@@ -5,6 +5,8 @@
#include <QFile>
#include "mainwindow.h"
#include "../config.h"
+#include <unistd.h>
+#include <sys/types.h>
int main(int argc, char *argv[])
{
@@ -20,6 +20,8 @@
#include <QTextStream>
#include <pcbsd-netif.h>
#include <pcbsd-utils.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "networkman.h"
#include "ui_networkman.h"
@@ -6,6 +6,8 @@
#include <QDebug>
#include "pfmanagerdlg.hpp"
#include "../config.h"
+#include <unistd.h>
+#include <sys/types.h>
int main ( int argc, char **argv )
{
@@ -4,6 +4,8 @@
#include <qstylefactory.h>
#include <qdesktopwidget.h>
#include <QDebug>
+#include <unistd.h>
+#include <sys/types.h>
#include "servicemanager.h"
#include "../config.h"
@@ -28,6 +28,7 @@
// catID: <name> (of category in repo)
// appID: <name> (of app in repo)
+ #include <unistd.h>
#include "pbiBackend.h"
@@ -98,7 +98,7 @@ public slots:
//variables - processes
ProcessManager *PMAN;
QString cDownload, cInstall, cRemove, cUpdate, cDownloadFile, cOther; //currently running command/pbi
- bool sDownload, sInstall, sRemove, sUpdate,; //flag that these processes were Stopped
+ bool sDownload, sInstall, sRemove, sUpdate; //flag that these processes were Stopped
QStringList PENDINGDL, PENDINGINSTALL, PENDINGREMOVAL, PENDINGUPDATE, PENDINGOTHER;
QString lDownload, lInstall, lRemove, lUpdate; //latest string output from process
//variables - other
@@ -4,6 +4,8 @@
#include <qstylefactory.h>
#include <qdesktopwidget.h>
#include <QDebug>
+#include <unistd.h>
+#include <sys/types.h>
#include "pbsystemtab.h"
#include "../config.h"
@@ -12,6 +12,8 @@
#include <QToolTip>
#include <QTranslator>
#include <QTextStream>
+#include <unistd.h>
+#include <sys/types.h>
#include "UpdaterTray.h"
#include "../config.h"
@@ -25,6 +25,8 @@
#include <qlayout.h>
#include <qtranslator.h>
#include <qtextcodec.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "pcbsdusermanager.h"
@@ -36,11 +36,17 @@ HAS_CONFIGURE= yes
QMAKE_PRO= src-qt4.pro
QMAKE_ARGS= -recursive ${QMAKE_PRO}
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900030
+IGNORE= requires FreeBSD 9.0 or later
+.endif
+
do-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO}
do-install:
cd ${WRKSRC} && make install INSTALL_ROOT=${STAGEDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
View
@@ -3,6 +3,8 @@
#include <QApplication>
#include <QDebug>
#include <QFile>
+#include <unistd.h>
+#include <sys/types.h>
#include "mainwindow.h"
#include "../config.h"
@@ -18,6 +18,8 @@
#include <QApplication>
#include <QDialogButtonBox>
#include <QPushButton>
+#include <unistd.h>
+#include <sys/types.h>
#include "mainwindow.h"
#include "../config.h"
View
@@ -71,7 +71,7 @@ if [ "$SYSTYPE" = "PCBSD" ]; then
echo ""
echo "Installed desktop environments:"
display_pkg_version " KDE:.........." "kde-workspace"
-display_pkg_version " Gnome:........" "gnome-desktop"
+display_pkg_version " Gnome:........" "gnome2-lite"
display_pkg_version " LXDE:........." "lxde-meta"
display_pkg_version " XFCE:........." "xfce"
display_pkg_version " e17:.........." "enlightenment"
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: ldpbiconfig
-# REQUIRE: mountcritremote cleanvar
-# BEFORE: DAEMON
-
-. /etc/rc.subr
-
-name="ldpbiconfig"
-ldconfig_command="/sbin/ldconfig"
-ldpbiconfig_dirlist=${ldpbiconfig_dirlist:-"/usr/local/etc/ldpbiconfig"}
-start_cmd="ldpbiconfig_start"
-stop_cmd=":"
-
-ldpbiconfig_start()
-{
- while read dir
- do
- hintmod="`echo $dir | sed 's|/|%|g'`"
- ldpbiconfig_init "$dir" "%${hintmod}"
-
- done < $ldpbiconfig_dirlist
-}
-
-# Enable a PBI's ldconfig hints file
-ldpbiconfig_init()
-{
- ldconfig_local_dirs="${1}/libdata/ldconfig"
- ldconfig_local32_dirs="${1}/libdata/ldconfig"
- ldconfig_paths="${1}/lib ${1}/lib/compat/pkg"
- ldconfig32_paths="${1}/lib ${1}/lib/compat/pkg"
- echo "ldpbiconfig for: ${1}"
- ldconfig=${ldconfig_command}
- local _files _ins
-
- _ins=
- checkyesno ldconfig_insecure && _ins="-i"
- if [ -x "${ldconfig_command}" ]; then
- _LDC="/lib /usr/lib"
- for i in ${ldconfig_local_dirs}; do
- if [ -d "${i}" ]; then
- _files=`find ${i} -type f`
- if [ -n "${_files}" ]; then
- ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`"
- fi
- fi
- done
- for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
- if [ -r "${i}" ]; then
- _LDC="${_LDC} ${i}"
- fi
- done
- if [ -d "/usr/local/lib" ] ; then _LDC="${_LDC} /usr/local/lib" ; fi
- if [ -d "/usr/local/lib/compat/pkg" ] ; then _LDC="${_LDC} /usr/local/lib/compat/pkg" ; fi
- check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
- ${ldconfig} -elf -f "/var/run/ld-elf.so.hints${2}" ${_ins} ${_LDC}
-
- case `sysctl -n hw.machine_arch` in
- amd64)
- for i in ${ldconfig_local32_dirs}; do
- if [ -d "${i}" ]; then
- _files=`find ${i} -type f`
- if [ -n "${_files}" ]; then
- ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`"
- fi
- fi
- done
- _LDC=""
- for i in ${ldconfig32_paths}; do
- if [ -r "${i}" ]; then
- _LDC="${_LDC} ${i}"
- fi
- done
- if [ -d "/usr/local32/lib" ] ; then _LDC="${_LDC} /usr/local32/lib" ; fi
- if [ -d "/usr/local32/lib/compat/pkg" ] ; then _LDC="${_LDC} /usr/local32/lib/compat/pkg" ; fi
- check_startmsgs &&
- echo '32-bit compatibility ldconfig path:' ${_LDC}
- ${ldconfig} -32 -m -f "/var/run/ld-elf32.so.hints${2}" ${_ins} ${_LDC}
- ;;
- esac
-
- # Legacy aout support for i386 only
- case `sysctl -n hw.machine_arch` in
- i386)
- # Default the a.out ldconfig path.
- : ${ldconfig_paths_aout=${ldconfig_paths}}
- _LDC=/usr/lib/aout
- for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
- if [ -r "${i}" ]; then
- _LDC="${_LDC} ${i}"
- fi
- done
- check_startmsgs && echo 'a.out ldconfig path:' ${_LDC}
- ${ldconfig} -aout -f "/var/run/ld.so.hints${2}" ${_ins} ${_LDC}
- ;;
- esac
- fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
@@ -29,6 +29,8 @@
ROOTFS=`mount | awk '/ \/ / {print $1}'`
BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )"
+if [ "$BEDS" = "dev" ] ; then BEDS="ROOT"; fi
+
display_loaderopts()
{
@@ -29,6 +29,10 @@ USE_PYTHON= yes
.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 900030
+IGNORE= requires FreeBSD 9.0 or later
+.endif
+
do-install:
cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX}
@@ -148,7 +148,6 @@ 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
@@ -78,4 +78,3 @@ 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
@@ -1,28 +0,0 @@
-#
-# $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 d4a3b4c

Please sign in to comment.