summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2004-07-17 09:34:46 +0000
committerDaouda Lo <daouda@mandriva.com>2004-07-17 09:34:46 +0000
commitdc64bb768862b266f0e538678826d97545a9063b (patch)
tree3560f321799e7beee483669fc4eadd9d3a46c7b4 /perl-install
parentf53ad58e60ff5102010996379da1da1abfdf8cfe (diff)
downloaddrakx-dc64bb768862b266f0e538678826d97545a9063b.tar
drakx-dc64bb768862b266f0e538678826d97545a9063b.tar.gz
drakx-dc64bb768862b266f0e538678826d97545a9063b.tar.bz2
drakx-dc64bb768862b266f0e538678826d97545a9063b.tar.xz
drakx-dc64bb768862b266f0e538678826d97545a9063b.zip
remove historical consolehelper files (pam.d and console.apps)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/apps.net_monitor4
-rw-r--r--perl-install/drakxtools.spec11
-rw-r--r--perl-install/pam.net_monitor6
4 files changed, 5 insertions, 18 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 253d5e880..eca24f33e 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -7,7 +7,7 @@ include Makefile.config
POFILES = $(shell ls share/po/*.po)
MOFILES = $(POFILES:%.po=%.mo)
-DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config apps.net_monitor ddcprobe drakxtools.spec pam.net_monitor serial_probe share/po share/diskdrake.rc share/net_applet.desktop $(STANDALONEPMS) standalone/icons pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/service_harddrake.sh
+DISTFILES = *.pm $(PMS_DIRS) Makefile Makefile.config ddcprobe drakxtools.spec serial_probe share/po share/diskdrake.rc share/net_applet.desktop $(STANDALONEPMS) standalone/icons pixmaps pixmaps/langs standalone/interactive_http rpcinfo-flushed.c standalone/service_harddrake.sh
OTHERS = $(OTHERDIRS) $(OTHERFILES)
OTHERDIRS = tools/ddcprobe tools/serial_probe
OTHERFILES = tools/rpcinfo-flushed.c
diff --git a/perl-install/apps.net_monitor b/perl-install/apps.net_monitor
deleted file mode 100644
index d4dea7f88..000000000
--- a/perl-install/apps.net_monitor
+++ /dev/null
@@ -1,4 +0,0 @@
-USER=root
-PROGRAM=/usr/sbin/net_monitor.real
-SESSION=true
-FALLBACK=false
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 6fbadad07..23547f4c8 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
Name: drakxtools
Version: 10
-Release: 54mdk
+Release: 55mdk
Url: http://www.mandrakelinux.com/en/drakx.php3
Source0: %name-%version.tar.bz2
License: GPL
@@ -173,10 +173,6 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/{%_initrddir,%_sysconfdir/{X11/xinit.d,sysconfig/harddrake2}}
touch $RPM_BUILD_ROOT/etc/sysconfig/harddrake2/previous_hw
-mkdir -p $RPM_BUILD_ROOT%_sysconfdir/{pam.d,security/console.apps}
-cp pam.net_monitor $RPM_BUILD_ROOT%_sysconfdir/pam.d/net_monitor
-cp apps.net_monitor $RPM_BUILD_ROOT%_sysconfdir/security/console.apps/net_monitor
-
dirs1="usr/lib/libDrakX usr/share/libDrakX"
(cd $RPM_BUILD_ROOT ; find $dirs1 usr/bin usr/sbin ! -type d -printf "/%%p\n")|egrep -v 'bin/.*harddrake' > %{name}.list
(cd $RPM_BUILD_ROOT ; find $dirs1 -type d -printf "%%%%dir /%%p\n") >> %{name}.list
@@ -290,8 +286,6 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
%files -f %{name}-gtk.list
%defattr(-,root,root)
-%config(noreplace) %_sysconfdir/pam.d/net_monitor
-%config(noreplace) %_sysconfdir/security/console.apps/net_monitor
/usr/share/autostart/net_applet.desktop
/usr/X11R6/bin/*
@@ -324,6 +318,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
%config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
%changelog
+* Sat Jul 17 2004 Daouda LO <daouda@mandrakesoft.com> 10-55mdk
+- remove historical consolehelper files (pam.d and console.apps)
+
* Thu Jul 15 2004 Olivier Blin <blino@mandrake.org> 10-54mdk
- drakboot: use bootloader and Xconfig instead of detect-resolution
- net_applet:
diff --git a/perl-install/pam.net_monitor b/perl-install/pam.net_monitor
deleted file mode 100644
index bc9a8d611..000000000
--- a/perl-install/pam.net_monitor
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient /lib/security/pam_rootok.so
-auth required /lib/security/pam_stack.so service=system-auth
-account required /lib/security/pam_permit.so
-session optional /lib/security/pam_xauth.so
-