diff --git a/aaa_base.changes b/aaa_base.changes index 19872a3..340e025 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jul 29 17:52:24 CEST 2010 - ro@suse.de + +- split off aaa_base extras subpackage with: + - ls settings and aliases + - bash completion + - other generic shell aliases + - quick_halt/poweroff/reboot script + - some default cronjobs +- modified bash.bashrc and csh.cshrc to split out ls settings +- drop alias for dir: that one has its own binary for a while +- recommend aaa_base-extras from main package + +------------------------------------------------------------------- +Tue Jul 27 15:34:59 UTC 2010 - cristian.rodriguez@opensuse.org + +- get_kernel_version : use O_CLOEXEC everywhere + ------------------------------------------------------------------- Fri Jul 16 17:22:27 CEST 2010 - werner@suse.de diff --git a/aaa_base.extrafilelist b/aaa_base.extrafilelist new file mode 100644 index 0000000..f08a93d --- /dev/null +++ b/aaa_base.extrafilelist @@ -0,0 +1,25 @@ +/etc/DIR_COLORS +/etc/cron.daily/suse.de-backup-rc.config +/etc/cron.daily/suse.de-backup-rpmdb +/etc/cron.daily/suse.de-check-battery +/etc/cron.daily/suse.de-cron-local +/etc/skel/.emacs +/etc/skel/.inputrc +/etc/java/README +/etc/profile.d/complete.bash +/etc/profile.d/alias.ash +/etc/profile.d/alias.bash +/etc/profile.d/alias.tcsh +/etc/profile.d/ls.tcsh +/etc/profile.d/ls.bash +/etc/init.d/skeleton +/etc/init.d/skeleton.compat +/root/.exrc +/sbin/quick_halt +/sbin/quick_poweroff +/sbin/quick_reboot +/usr/sbin/setDefaultJava +/usr/share/man/man7/init.d.7 +/usr/share/man/man5/route.conf.5 +/usr/share/man/man8/resolv+.8 +/usr/share/man/man8/quick_halt.8 diff --git a/aaa_base.spec b/aaa_base.spec index 9a16432..0199f5b 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -1,5 +1,5 @@ # -# spec file for package aaa_base (Version 11.3) +# spec file for package aaa_base (Version 11.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,35 +19,44 @@ Name: aaa_base -Version: 11.3 -Release: 9 +Version: 11.4 +Release: 1 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger Provides: aaa_skel = %{version}-%{release} Obsoletes: aaa_skel < %{version} Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc -Recommends: cron logrotate netcfg udev net-tools +Recommends: cron logrotate netcfg udev net-tools aaa_base-extras PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv AutoReqProv: on Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 Source3: aaa_base.specialfilelist +Source4: aaa_base.extrafilelist Source5: arch_special.tar.bz2 Source7: sysconfig_parts.tar.bz2 Source8: get_kernel_version.c Source20: aaa_base-rpmlintrc Source21: aaa_base.pre Source22: aaa_base.post -# %ifarch x86_64 -# Obsoletes: tpctl <= 4.17 -# %endif %description This package installs several important configuration files. Central scripts like SuSEconfig are also in this package. +%package extras +License: GPLv2+ +Summary: SUSE Linux Base Package (recommended part) +Group: System/Fhs +Requires: %{name} = %{version} + +%description extras +The parts of aaa_base that should be installed by default but are not +strictly required to run a system. (Shell aliases, bash completions +and convenience hacks). + %prep %setup -n aaa_base -b 5 -b 7 cd .. @@ -99,12 +108,21 @@ done test -x /usr/sbin/Check && /usr/sbin/Check # for i in `( cd $RPM_BUILD_ROOT ; find * | sort )` ; do + grep -qx "/$i" %{S:4} && continue if ! grep -E "^.* /$i\$" %{S:3} ; then if ! test -d $RPM_BUILD_ROOT/$i ; then echo "/$i" fi fi done > aaa_base.files +for i in `( cd $RPM_BUILD_ROOT ; find * | sort )` ; do + grep -qx "/$i" %{S:4} || continue + if ! grep -E "^.* /$i\$" %{S:3} ; then + if ! test -d $RPM_BUILD_ROOT/$i ; then + echo "/$i" + fi + fi +done > aaa_base-extras.files %pre -f ../scripts/aaa_base.pre @@ -122,4 +140,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %files -f aaa_base.files %defattr(-,root,root) +%files extras -f aaa_base-extras.files +%defattr(-,root,root) + %changelog diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 0fdf82d..352eddd 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:448b1681d7bf7a6c883720521b6664888db37f7b57573b301f8844b82886562c -size 81434 +oid sha256:218d3906b9414cd80850a96979a99cc8205c9fc4e6161aa654063f957566b3c8 +size 81629 diff --git a/get_kernel_version.c b/get_kernel_version.c index edc5509..b1f706c 100644 --- a/get_kernel_version.c +++ b/get_kernel_version.c @@ -14,6 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define _GNU_SOURCE #include #include #include @@ -47,7 +48,7 @@ main (int argc, char *argv[]) /* check if file exist and is compressed */ { unsigned char buf [2]; - int fd = open (argv[1], O_RDONLY); + int fd = open (argv[1], O_RDONLY | O_CLOEXEC); if (fd == -1) { fprintf (stderr, "Cannot open kernel image \"%s\"\n", argv[1]); @@ -64,7 +65,7 @@ main (int argc, char *argv[]) if (buf [0] == 037 && (buf [1] == 0213 || buf [1] == 0236)) { snprintf (command, sizeof (command), "/bin/gzip -dc %s 2>/dev/null", argv[1]); - fp = popen (command, "r"); + fp = popen (command, "re"); if (fp == NULL) { fprintf (stderr, "%s: faild\n", command); @@ -73,7 +74,7 @@ main (int argc, char *argv[]) } else { - fp = fopen (argv[1],"r"); + fp = fopen (argv[1],"re"); } close (fd); }