rpms/vixie-cron/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vixie-cron.spec, 1.101, 1.102

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13002

Modified Files:
	.cvsignore sources vixie-cron.spec 
Log Message:
new upstream source, which merged mainly old source file and patches




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 14:04:39 -0000	1.3
+++ .cvsignore	28 Aug 2007 13:21:36 -0000	1.4
@@ -1 +1 @@
-vixie-cron-4.1.tar.gz
+vixie-cron-4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 14:04:39 -0000	1.3
+++ sources	28 Aug 2007 13:21:36 -0000	1.4
@@ -1 +1 @@
-84dc41e24852e497c21578446e5d9832  vixie-cron-4.1.tar.gz
+e84f03cbb0f4efb8bbb5712cb4300bf4  vixie-cron-4.2.tar.gz


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vixie-cron.spec	30 Jul 2007 14:51:54 -0000	1.101
+++ vixie-cron.spec	28 Aug 2007 13:21:36 -0000	1.102
@@ -9,87 +9,12 @@
 %endif
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
-Version: 4.1
-Release: 85%{?dist}
+Version: 4.2
+Release: 1%{?dist}
 Epoch: 4
-License: BSD
+License: GPL
 Group: System Environment/Base
-Source0: ftp://ftp.isc.org/isc/cron/vixie-cron-%{version}.tar.gz
-Source1: vixie-cron.init
-Source2: crond.sysconfig
-Patch0:  vixie-cron-4.1-_0_rh_Makefile.patch
-Patch1:  vixie-cron-4.1-_1_rh_pathnames.patch
-Patch2:  vixie-cron-4.1-_2_config.patch
-Patch3:  vixie-cron-4.1-_3_selinux.patch
-Patch4:  vixie-cron-4.1-_4_vfork_sigchld.patch
-Patch5:  vixie-cron-4.1-_5_sprintf_misc.patch
-Patch6:  vixie-cron-4.1-_6_rh_crond.patch
-Patch7:  vixie-cron-4.1-_7_crontab-stdin.patch
-Patch8:  vixie-cron-4.1-_8_root-allowed.patch
-Patch9:  vixie-cron-4.1-_9_no-header.patch
-Patch10: vixie-cron-4.1-_10_manpages.patch
-Patch11: vixie-cron-4.1-_11_with_selinux.patch
-Patch12: vixie-cron-4.1-_12_pam.patch
-Patch13: vixie-cron-4.1-_13_with_pam.patch
-Patch14: vixie-cron-4.1-_14_pamd_crond.patch
-Patch15: vixie-cron-4.1-_15_system_crontab_user.patch
-Patch16: vixie-cron-4.1-_16_crontab_selinux.patch
-Patch17: vixie-cron-4.1-_17_pam-rootok.patch
-Patch18: vixie-cron-4.1-_18_cron_log_facility.patch
-Patch19: vixie-cron-4.1-_19_crontab_stat_not_fstat.patch
-Patch20: vixie-cron-4.1-_20_nickname_man.patch
-Patch21: vixie-cron-4.1-_21_-i_option.patch
-Patch22: vixie-cron-4.1-_22_no_0600_mode_enforce.patch
-Patch23: vixie-cron-4.1-_23_freecon_segv.patch
-Patch24: vixie-cron-4.1-_24_crontab_selinux_new.patch
-Patch25: vixie-cron-4.1-_25-allow-root-crontab.patch
-Patch26: vixie-cron-4.1-_26-saved-uids.patch
-Patch27: vixie-cron-4.1-_27-no-strip-header-comments.patch
-Patch28: vixie-cron-4.1-_28-fix_ppc.patch
-Patch29: vixie-cron-4.1-_29-permit_any_crontab_option.patch
-Patch30: vixie-cron-4.1-_30-uninitialized.patch
-Patch31: vixie-cron-4.1-_31-allow_pam_access.patch
-Patch32: vixie-cron-4.1-_32-no_mail_rcpt_safe_p.patch
-Patch33: vixie-cron-4.1-_33-fix_selinux_segfault.patch
-Patch34: vixie-cron-4.1-_34-pam_fail_close_session.patch
-Patch35: vixie-cron-4.1-_35-crontab-job-control.patch
-Patch36: vixie-cron-4.1-_36-pam_close_fork_fail.patch
-Patch37: vixie-cron-4.1-_37-limits.patch
-Patch38: vixie-cron-4.1-_38-CAN-2005-1038.patch
-Patch39: vixie-cron-4.1-loginuid.patch
-Patch40: vixie_cron-4.1-162887.patch
-Patch41: vixie-cron-4.1-CAN-2005-1038-fix-race.patch
-Patch42: vixie-cron-4.1-_42-getseuserbyname.patch
-Patch43: vixie-cron-4.1-_43-config_comments.patch
-Patch44: vixie-cron-4.1-_44-build_env.patch
-Patch45: vixie-cron-4.1-_45-warnings.patch
-Patch46: vixie-cron-4.1-_46-audit.patch
-Patch47: vixie-cron-4.1-_47-m_option.patch
-Patch48: vixie-cron-4.1-_48-security.patch
-Patch49: vixie-cron-4.1-_49-bz178436.patch
-Patch50: vixie-cron-4.1-_50-bz178931.patch
-Patch51: vixie-cron-4.1-_51-bz180145-mail_i18n.patch
-Patch52: vixie-cron-4.1-_52-bz181439.patch
-Patch53: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
-Patch54: vixie-cron-4.1-_54_bz198019_database_changes.patch
-Patch55: vixie-cron-4.1-man-page-typo.patch
-Patch56: vixie-cron-4.1-_55-bz203746.patch
-Patch57: vixie-cron-4.1-_44-delayed_database.patch 
-Patch58: vixie-cron-4.1-_52-bz181439_2.patch
-Patch59: vixie-cron-4.1-_56-pam-session-system-auth.patch
-Patch60: vixie-cron-4.1-bz178836.patch
-Patch61: vixie-cron-4.1-_60-SELinux-contains-range.patch
-Patch62: vixie-cron-4.1-_61symlink.patch
-Patch63: vixie-cron-4.1-manual.patch
-Patch64: vixie-cron-4.1-_62newyear.patch
-Patch65: vixie-cron-4.1-_63newavc.patch
-Patch66: vixie-cron-4.1-bz220376.patch
-Patch67: vixie-cron-4.1-hardlink.patch
-Patch68: vixie-cron-4.1-mancrond.patch
-Patch69: vixie-cron-4.1-tmp.patch
-Patch70: vixie-cron-4.1-fixs.patch
-Patch71: vixie-cron-4.1-pam_crontab.patch
-
+Source0: https://hosted.fedoraproject.org/projects/vixie-cron/wiki/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -114,97 +39,24 @@
 Requires(preun): /sbin/service
 
 %description
-The vixie-cron package contains the Vixie version of cron.  Cron is a
+The vixie-cron package contains the Vixie version of cron. Cron is a
 standard UNIX daemon that runs specified programs at scheduled times.
 Vixie cron adds better security and more powerful configuration
-options to the standard version of cron.
+options to the standard version of cron. This cron can use pam and
+selinux for higher level of security.
 
 %prep
 %setup -q
-%patch0 -p1 -b .rh_Makefile
-%patch1 -p1 -b .rh_pathnames
-%patch2 -p1 -b .config
-%patch3 -p1 -b .selinux
-%patch4 -p1 -b .vfork_sigchld
-%patch5 -p1 -b .sprintf_misc
-%patch6 -p1 -b .rh_crond
-%patch7 -p1 -b .crontab-stdin
-%patch8 -p1 -b .root-allowed
-%patch9 -p1 -b .no-header
-%patch10 -p1 -b .manpages
-#%if %{WITH_SELINUX}
-#SELinux
-# Enables SELinux support
-%patch11 -p1 -b .with_selinux
-#%endif
-%patch12 -p1 -b .pam
-#%if %{WITH_PAM}
-%patch13 -p1 -b .with_pam
-%patch14 -p1 -b .pamd_crond
-%patch15 -p1 -b .system_crontab_user
-#%endif
-%patch16 -p1 -b .crontab_selinux
-%patch17 -p1 -b .pam-rootok
-%patch18 -p1 -b .cron_log_facility
-%patch19 -p1 -b .crontab_stat_not_fstat
-%patch20 -p1 -b .nickname_man
-%patch21 -p1 -b .-i_option
-%patch22 -p1 -b .no_0600_mode_enforce
-#%if %{WITH_SELINUX}
-%patch23 -p1 -b .freecon_segv
-%patch24 -p1 -b .selinux_crontab_new
-#%endif
-%patch25 -p1 -b .allow-root-crontab
-%patch26 -p1 -b .saved_uids
-%patch27 -p1 -b .no-strip-header-comments
-%patch28 -p1 -b .fix_ppc
-%patch29 -p1 -b .permit_any_crontab_option
-%patch30 -p1 -b .uninitialized
-%patch31 -p1 -b .allow_pam_access
-%patch32 -p1 -b .no_mail_rcpt_safe_p
-%patch33 -p1 -b .fix_selinux_segfault
-%patch34 -p1 -b .pam_fail_close_session
-%patch35 -p1 -b .job_control
-%patch36 -p1 -b .pam_close_fork_fail
-%patch37 -p1 -b .limits
-%patch38 -p1 -b .CAN-2005-1038
-%patch39 -p1 -b .loginuid
-%patch40 -p1 -b .162887
-%patch41 -p1 -b .CAN-2005-1038-fix-race
-%patch42 -p1 -b .getseuserbyname
-%patch43 -p1 -b .config_comments
-%patch44 -p1 -b .build_env
-%patch45 -p1 -b .warnings
-%patch46 -p1 -b .audit_deny
-%patch47 -p1 -b .-m_option
-%patch48 -p1 -b .security
-%patch49 -p1 -b .bz178436
-%patch50 -p1 -b .bz178931
-%patch51 -p1 -b .mail_i18n
-%patch52 -p1 -b .bz181439
-%patch53 -p1 -b .selinux_mls
-%patch54 -p1 -b .bz198019
-%patch55 -p1 -b .man-page-typo
-%patch56 -p1 -b .bz203746
-%patch57 -p1 -b .delayed_database
-%patch58 -p1 -b .bz181439_2
-%patch59 -p1 -b .pam-session-system-auth
-%patch60 -p1 -b .bz178836
-%patch61 -p1 -b .selinux-contains-range
-%patch62 -p1 -b ._61symlink.patch
-%patch63 -p1 -b .manual
-%patch64 -p1 -b ._62newyear
-%patch65 -p1 -b ._63newavc
-#%patch66 -p1 -b .bz220376
-%patch67 -p1 -b .hardlink
-%patch68 -p1 -b .mancrond
-%patch69 -p1 -b .tmp
-%patch70 -p1 -b .fix
-%patch71 -p1 -b .pamcrontab
+
+aclocal
+autoheader
+automake -a
+autoconf
 
 %build
-# RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \
+%configure --with-pam
+
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint" \
 %if %{WITH_SELINUX}
 WITH_SELINUX=1 \
 %endif
@@ -221,16 +73,17 @@
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5,8}
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 make install DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir}
-mkdir -pm700 $RPM_BUILD_ROOT/var/spool/cron
-mkdir -pm755 $RPM_BUILD_ROOT/etc/cron.d
-install -pm755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/crond
+mkdir -pm700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron
+mkdir -pm755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/crond.pam $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/crond
+mv ./vixie-cron.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
+mv ./crond.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/crond
 %if ! %{WITH_PAM}
-	rm -rf $RPM_BUILD_ROOT/etc/pam.d
+	rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 %endif
 
 %clean
@@ -257,25 +110,24 @@
 
 %files
 %defattr(-,root,root,-)
-%{_sbindir}/crond
+%attr(755,root,root) %{_sbindir}/crond
 %attr(6755,root,root) %{_bindir}/crontab
 %{_mandir}/man8/crond.*
 %{_mandir}/man8/cron.*
 %{_mandir}/man5/crontab.*
 %{_mandir}/man1/crontab.*
-%attr(700,root,root) %dir /var/spool/cron
-%attr(700,root,root) %dir /etc/cron.d
-%attr(755,root,root) /etc/rc.d/init.d/crond
+%attr(700,root,root) %dir %{_localstatedir}/spool/cron
+%attr(700,root,root) %dir %{_sysconfdir}/cron.d
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/crond
 %if %{WITH_PAM}   
-	%attr(0644,root,root) %config(noreplace) /etc/pam.d/crond
+	%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
 %endif
-%config(noreplace) /etc/sysconfig/crond
+%config(noreplace) %{_sysconfdir}/sysconfig/crond
+%doc %{_datadir}/doc/cron/*
 
 %changelog
-* Mon Jul 31 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-85
-- add pam to crontab, clean in security.c
-- fix typo in init script
-- Resolves: rhbz#249512
+* Tue Aug 28 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.2-1
+- new upstream source, which merged mainly old source file and patches
 
 * Wed Jul 11 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-84
 - fix init script