diff options
author | Will Andrews <will@FreeBSD.org> | 2003-12-10 20:56:01 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2003-12-10 20:56:01 +0000 |
commit | ca8ce24b658ae5266b9754b471939d77ec6ce31c (patch) | |
tree | 85a8894397abcaac98e7867f69818489dbc15842 /sysutils | |
parent | 22ef317c3f734f208c846e92fa3e1156e8be114e (diff) |
Fix bug in KUser on 5.x where root user is deleted merely by using the
program. PORTREVISION bumped because this is a particularly nasty problem.
Patch by: Adriaan de Groot <adridg@cs.kun.nl>
Submitted by: Andy Fawcett <andy@athame.co.uk>
Notes
Notes:
svn path=/head/; revision=95566
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/kdeadmin3/Makefile | 1 | ||||
-rw-r--r-- | sysutils/kdeadmin3/files/patch-kuser-kuser.cpp | 17 | ||||
-rw-r--r-- | sysutils/kdeadmin4/Makefile | 1 | ||||
-rw-r--r-- | sysutils/kdeadmin4/files/patch-kuser-kuser.cpp | 17 |
4 files changed, 36 insertions, 0 deletions
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index b3bc2c3a21d0..163f2c66e773 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdeadmin PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src diff --git a/sysutils/kdeadmin3/files/patch-kuser-kuser.cpp b/sysutils/kdeadmin3/files/patch-kuser-kuser.cpp new file mode 100644 index 000000000000..d2c5a4239774 --- /dev/null +++ b/sysutils/kdeadmin3/files/patch-kuser-kuser.cpp @@ -0,0 +1,17 @@ +--- kuser/kuser.cpp.orig Wed Dec 10 22:03:21 2003 ++++ kuser/kuser.cpp Wed Dec 10 22:05:05 2003 +@@ -479,6 +479,14 @@ + + // Start reading passwd file(s) + ++#ifdef Q_OS_FREEBSD ++ // For FreeBSD, some weird effect in the C++ libraries ++ // eats the first entry of the passwd file on -CURRENT, ++ // which renders KUser a system-destroyer instead of ++ // just a useless tool. ++ setpwent(); ++#endif ++ + for(int i = 0; i < MAXFILES; i++) { + rc = stat(QFile::encodeName(filename), &st); + if(rc != 0) { diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index b3bc2c3a21d0..163f2c66e773 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdeadmin PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src diff --git a/sysutils/kdeadmin4/files/patch-kuser-kuser.cpp b/sysutils/kdeadmin4/files/patch-kuser-kuser.cpp new file mode 100644 index 000000000000..d2c5a4239774 --- /dev/null +++ b/sysutils/kdeadmin4/files/patch-kuser-kuser.cpp @@ -0,0 +1,17 @@ +--- kuser/kuser.cpp.orig Wed Dec 10 22:03:21 2003 ++++ kuser/kuser.cpp Wed Dec 10 22:05:05 2003 +@@ -479,6 +479,14 @@ + + // Start reading passwd file(s) + ++#ifdef Q_OS_FREEBSD ++ // For FreeBSD, some weird effect in the C++ libraries ++ // eats the first entry of the passwd file on -CURRENT, ++ // which renders KUser a system-destroyer instead of ++ // just a useless tool. ++ setpwent(); ++#endif ++ + for(int i = 0; i < MAXFILES; i++) { + rc = stat(QFile::encodeName(filename), &st); + if(rc != 0) { |