Changeset d4a3b4c


Ignore:
Timestamp:
10/03/13 07:36:26 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
b5c75655, 6c7e0dca, e7b4478
Parents:
c823860f (diff), 05784db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

Files:
2 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/installcd-prunelist

    r5313c46 rb0808996  
    2020usr/share/man 
    2121usr/share/nls 
    22 usr/share/openssl 
    2322usr/share/pcvt 
    2423usr/share/security 
     
    189188usr/bin/objformat 
    190189usr/bin/od 
    191 usr/bin/openssl 
    192190usr/bin/pagesize 
    193191usr/bin/paste 
  • src-qt4/life-preserver/LPWizard.cpp

    r4a54eef rb6c7b40  
    22#include "ui_LPWizard.h" 
    33 
    4 LPWizard::LPWizard(QWidget *parent = 0) : QWizard(parent), ui(new Ui::LPWizard){ 
     4LPWizard::LPWizard(QWidget *parent) : QWizard(parent), ui(new Ui::LPWizard){ 
    55  //Initialize the graphical items 
    66  ui->setupUi(this);  //load the mainUI.ui file 
  • src-qt4/life-preserver/LPWizard.h

    r4a54eef rb6c7b40  
    1515        Q_OBJECT 
    1616public: 
    17         explicit LPWizard(QWidget*); 
     17        explicit LPWizard(QWidget *parent = 0); 
    1818        ~LPWizard(); 
    1919 
  • src-qt4/life-preserver/main.cpp

    r2a5e337 r302f10d  
    44#include <QDebug> 
    55#include <QFile> 
     6#include <unistd.h> 
     7#include <sys/types.h> 
    68 
    79#include "LPTray.h" 
  • src-qt4/life-preserver/mainUI.cpp

    r284b216 r5d6497b  
    11#include "mainUI.h" 
    22#include "ui_mainUI.h" 
     3#include <unistd.h> 
    34 
    45mainUI::mainUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::mainUI){ 
  • src-qt4/pc-adsldap/main.cpp

    r1620346 rbb92b1b  
    55#include <QDebug> 
    66#include <QFile> 
     7#include <unistd.h> 
     8#include <sys/types.h> 
    79 
    810int main( int argc, char ** argv ) 
  • src-qt4/pc-bootconfig/main.cpp

    rb3cb948 r7c40e31  
    55#include <QDebug> 
    66#include "mainUI.h" 
     7#include <unistd.h> 
     8#include <sys/types.h> 
    79 
    810#ifndef PREFIX 
     
    3032    w.show(); 
    3133    //Check for root 
    32     if (0 != geteuid()) 
     34    if (0 != getuid()) 
    3335    { 
    3436        QMessageBox msg; 
  • src-qt4/pc-controlpanel/mainwnd.cpp

    r7e47edf r7cc177e  
    2828#include "deinfo.h" 
    2929#include "../config.h" 
     30#include <unistd.h> 
    3031 
    3132#include <QFile> 
  • src-qt4/pc-gdmconf/main.cpp

    re49ab68 r7cc177e  
    66#include "mainwindow.h" 
    77#include "../config.h" 
     8#include <unistd.h> 
     9#include <sys/types.h> 
    810 
    911int main(int argc, char *argv[]) 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    r7c7f02c r7cc177e  
    2121#include <pcbsd-netif.h> 
    2222#include <pcbsd-utils.h> 
     23#include <unistd.h> 
     24#include <sys/types.h> 
    2325 
    2426#include "networkman.h" 
  • src-qt4/pc-pfmanager/main.cpp

    r1620346 r7cc177e  
    77#include "pfmanagerdlg.hpp" 
    88#include "../config.h" 
     9#include <unistd.h> 
     10#include <sys/types.h> 
    911 
    1012int main ( int argc, char **argv ) 
  • src-qt4/pc-servicemanager/main.cpp

    r1620346 r7cc177e  
    55#include <qdesktopwidget.h> 
    66#include <QDebug> 
     7#include <unistd.h> 
     8#include <sys/types.h> 
    79#include "servicemanager.h" 
    810#include "../config.h" 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    re46485b r7cc177e  
    2929 //  appID: <name> (of app in repo) 
    3030  
     31 #include <unistd.h> 
    3132 #include "pbiBackend.h" 
    3233 
  • src-qt4/pc-softwaremanager/pbiBackend.h

    rdee1bcb r7cc177e  
    9999        ProcessManager *PMAN; 
    100100        QString cDownload, cInstall, cRemove, cUpdate, cDownloadFile, cOther; //currently running command/pbi 
    101         bool sDownload, sInstall, sRemove, sUpdate,; //flag that these processes were Stopped 
     101        bool sDownload, sInstall, sRemove, sUpdate; //flag that these processes were Stopped 
    102102        QStringList PENDINGDL, PENDINGINSTALL, PENDINGREMOVAL, PENDINGUPDATE, PENDINGOTHER; 
    103103        QString lDownload, lInstall, lRemove, lUpdate; //latest string output from process 
  • src-qt4/pc-sysmanager/main.cpp

    r1620346 r7cc177e  
    55#include <qdesktopwidget.h> 
    66#include <QDebug> 
     7#include <unistd.h> 
     8#include <sys/types.h> 
    79#include "pbsystemtab.h" 
    810#include "../config.h" 
  • src-qt4/pc-systemupdatertray/UpdaterTray.cpp

    r53791e4 r7cc177e  
    1313#include <QTranslator> 
    1414#include <QTextStream> 
     15#include <unistd.h> 
     16#include <sys/types.h> 
    1517 
    1618#include "UpdaterTray.h" 
  • src-qt4/pc-usermanager/pcbsdusermanager.cpp

    r1620346 r7cc177e  
    2626#include <qtranslator.h> 
    2727#include <qtextcodec.h> 
     28#include <unistd.h> 
     29#include <sys/types.h> 
    2830 
    2931#include "pcbsdusermanager.h" 
  • src-qt4/port-files/Makefile

    r29f152c r0535dca0  
    3737QMAKE_ARGS=     -recursive ${QMAKE_PRO} 
    3838 
     39.include <bsd.port.pre.mk> 
     40 
     41.if ${OSVERSION} < 900030 
     42IGNORE=         requires FreeBSD 9.0 or later 
     43.endif 
     44 
    3945do-configure: 
    4046        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ 
     
    4450        cd ${WRKSRC} && make install INSTALL_ROOT=${STAGEDIR} 
    4551 
    46 .include <bsd.port.mk> 
     52.include <bsd.port.post.mk> 
  • src-qt4/qsudo/main.cpp

    r33b8b3a r7cc177e  
    44#include <QDebug> 
    55#include <QFile> 
     6#include <unistd.h> 
     7#include <sys/types.h> 
    68#include "mainwindow.h" 
    79#include "../config.h" 
  • src-qt4/qsudo/mainwindow.cpp

    r49e8627 r7cc177e  
    1919#include <QDialogButtonBox> 
    2020#include <QPushButton> 
     21#include <unistd.h> 
     22#include <sys/types.h> 
    2123#include "mainwindow.h" 
    2224#include "../config.h" 
  • src-sh/about/about

    r1620346 r05784db  
    7272echo "Installed desktop environments:" 
    7373display_pkg_version "       KDE:.........." "kde-workspace" 
    74 display_pkg_version "       Gnome:........" "gnome-desktop" 
     74display_pkg_version "       Gnome:........" "gnome2-lite" 
    7575display_pkg_version "       LXDE:........." "lxde-meta" 
    7676display_pkg_version "       XFCE:........." "xfce" 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos

    r98ca661 rca660df  
    3030ROOTFS=`mount | awk '/ \/ / {print $1}'` 
    3131BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )" 
     32if [ "$BEDS" = "dev" ] ; then BEDS="ROOT"; fi 
     33 
    3234 
    3335display_loaderopts() 
  • src-sh/port-files/Makefile

    r29f152c r0535dca0  
    3030.include <bsd.port.pre.mk> 
    3131 
     32.if ${OSVERSION} < 900030 
     33IGNORE=         requires FreeBSD 9.0 or later 
     34.endif 
     35 
    3236do-install: 
    3337        cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} 
  • src-sh/port-files/pkg-plist

    r3ce959a rf6519e3  
    149149share/pcbsd/conf/server-excludes 
    150150share/pcbsd/pefs/other 
    151 share/pcbsd/pefs/sshd 
    152151share/pcbsd/pefs/system 
    153152share/pcbsd/distfiles/desktop-overlay.txz 
  • src-sh/xtrafiles/local/bin/enable_user_pefs

    r3ce959a rf6519e3  
    7979cp /usr/local/share/pcbsd/pefs/other /etc/pam.d/other 
    8080cp /usr/local/share/pcbsd/pefs/system /etc/pam.d/system 
    81 cp /usr/local/share/pcbsd/pefs/sshd /etc/pam.d/sshd 
  • src-qt4/pc-usermanager/simpleaddcode.cpp

    r87d35b7 rc823860f  
    182182    { 
    183183    case 0: 
    184         qDebug() << "Case 0 was found!!!........." + username + " pass: " + password; 
     184        qDebug() << "Case 0 was found!!!........." + username; //+ " pass: " + password; 
     185        //Do NOT show the password on comitted versions - this can get saved to a log file on the system (~/.xsession-errors) 
     186     
    185187        //back->changePassword(username, password); 
    186188        close(); 
Note: See TracChangeset for help on using the changeset viewer.