Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5a13514532dd0203378d7daae5272f2c117e4cc
commit f5a13514532dd0203378d7daae5272f2c117e4cc Author: James Buren <[email protected]> Date: Wed Dec 11 08:15:10 2013 -0600 fbterm-1.7.0-4-x86_64 * /usr/bin/fbterm-login -> /usr/libexec/fbterm-login diff --git a/source/apps-extra/fbterm/FrugalBuild b/source/apps-extra/fbterm/FrugalBuild index 196e6f1..363139c 100644 --- a/source/apps-extra/fbterm/FrugalBuild +++ b/source/apps-extra/fbterm/FrugalBuild @@ -24,22 +24,22 @@ sha1sums=('dc7b7ff29212c1551f35bf7a50967454d3b8c67c' \ 'aeaa28195ceccc1f846b3c834deecb8fc875c10f' \ '5d89df543eed4952b55840c35dde4f2ae715c964' \ 'cd0030fc3acf1209068fc738e116f86717054e27' \ - 'cac35d8ead091157395f3c51263208f91cef42ea' \ + '7f4490ee65fab774721402789e18fe756a9214c9' \ '85d75cf92a6e53f2045ff2b95b54c88b28101810' \ 'd64fcf93bc6a7d8c07e735c0b6003bf4a7397a4f' \ - '8c3620da414b657376ee7538920f07e34c1d7367') + '104f49095c6044189ea4faa9eb0ae7b7de27f9ff') build() { Fbuild TERMINFO=$Fdestdir/usr/share/terminfo tic terminfo/$pkgname || Fdie - Fexec cc -Wall -Wextra -lutil $CFLAGS $Fsrcdir/fbterm-login.c -o $Fdestdir/usr/bin/fbterm-login || Fdie Ffile /etc/fbtermrc Fmkdir /var/lib/fbterm Fln /etc/fbtermrc /var/lib/fbterm/.fbtermrc Fdirschown /var/lib/fbterm 85 85 # Ffileschown /var/lib/fbterm 85 85 Fexe /usr/libexec/fbterm-daemon + Fexec cc -Wall -Wextra -lutil $CFLAGS $Fsrcdir/fbterm-login.c -o $Fdestdir/usr/libexec/fbterm-login || Fdie Ffile /lib/systemd/system/fbterm.service Ffile 1.7.png /usr/share/fbterm/wallpaper4x3 Ffile 1.7wide.png /usr/share/fbterm/wallpaper8x5 diff --git a/source/apps-extra/fbterm/fbterm-daemon b/source/apps-extra/fbterm/fbterm-daemon index 877377a..1b20595 100644 --- a/source/apps-extra/fbterm/fbterm-daemon +++ b/source/apps-extra/fbterm/fbterm-daemon @@ -66,4 +66,4 @@ EOF export FBTERM_BACKGROUND_IMAGE fi -exec fbterm -- /usr/bin/fbterm-login +exec fbterm -- /usr/libexec/fbterm-login diff --git a/source/apps-extra/fbterm/login-seteuid.patch b/source/apps-extra/fbterm/login-seteuid.patch index 5daed84..4198dfc 100644 --- a/source/apps-extra/fbterm/login-seteuid.patch +++ b/source/apps-extra/fbterm/login-seteuid.patch @@ -1,6 +1,6 @@ diff -ur a/src/lib/shell.cpp b/src/lib/shell.cpp --- a/src/lib/shell.cpp 2013-11-21 22:33:22.217250976 -0600 -+++ b/src/lib/shell.cpp 2013-12-11 08:04:55.271940460 -0600 ++++ b/src/lib/shell.cpp 2013-12-11 08:13:53.583920445 -0600 @@ -32,6 +32,9 @@ #include <sys/wait.h> #include "shell.h" @@ -24,11 +24,11 @@ diff -ur a/src/lib/shell.cpp b/src/lib/shell.cpp setenv("TERM", "linux", 1); + if( -+ getuid() == FBTERM_UID && -+ getgid() == FBTERM_GID && -+ command != 0 && -+ command[0] != 0 && -+ strcmp(command[0],"/usr/bin/fbterm-login") == 0 ++ getuid() == FBTERM_UID && ++ getgid() == FBTERM_GID && ++ command != 0 && ++ command[0] != 0 && ++ strcmp(command[0],"/usr/libexec/fbterm-login") == 0 + ) + { + seteuid(0); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
