auto-import changelog data from quota-3.10-1.src.rpm
Tue Jan 27 2004 Florian La Roche <Florian.LaRoche@redhat.de> - add -pie support - update to 3.10 Sat Aug 16 2003 Steve Dickson <SteveD@RedHat.com> - upgraded to 3.0.9 - added quota-3.09-root_sbindir.patch
This commit is contained in:
cvsdist
parent
93febb6cab
commit
902fba146f
@ -1 +1 @@
|
||||
quota-3.06.tar.gz
|
||||
quota-3.10.tar.gz
|
||||
|
||||
35
quota-3.06-pie.patch
Normal file
35
quota-3.06-pie.patch
Normal file
@ -0,0 +1,35 @@
|
||||
--- quota-tools/Makefile.in.lr 2004-01-27 15:20:18.000000000 +0100
|
||||
+++ quota-tools/Makefile.in 2004-01-27 15:21:48.000000000 +0100
|
||||
@@ -49,6 +49,10 @@
|
||||
|
||||
all: $(PROGS)
|
||||
|
||||
+
|
||||
+svc_socket.o rquota_server.o rquota_svc.o $(filter-out rquota_xdr.o,$(LIBOBJS)): %.o: %.c
|
||||
+ $(CC) $(CFLAGS) -fpie -c $<
|
||||
+
|
||||
clean:
|
||||
-rm -f core *.o .*.d
|
||||
|
||||
@@ -125,10 +129,10 @@
|
||||
convertquota: convertquota.o $(LIBOBJS)
|
||||
|
||||
rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) -pie -o $@ $^ $(LIBS)
|
||||
+ @if readelf -d $@|fgrep -q TEXTREL; then echo "*** Text relocation"; false; else true; fi
|
||||
|
||||
pot.o: pot.c pot.h
|
||||
- $(CC) $(CFLAGS) -c $<
|
||||
|
||||
rquota.h: rquota.x
|
||||
$(RPCGEN) -h -o $@ $<
|
||||
@@ -137,7 +141,7 @@
|
||||
$(RPCGEN) -c -o $@ $<
|
||||
|
||||
rquota_xdr.o: rquota_xdr.c rquota.h
|
||||
- $(CC) $(CFLAGS) -Wno-unused -c $<
|
||||
+ $(CC) $(CFLAGS) -Wno-unused -fpie -c $<
|
||||
|
||||
rquota_clnt.c: rquota.x
|
||||
$(RPCGEN) -l -o $@ $<
|
||||
@ -1,14 +1,13 @@
|
||||
--- quota-tools/warnquota.conf.orig Mon Jul 1 15:31:21 2002
|
||||
+++ quota-tools/warnquota.conf Mon Jul 1 15:34:50 2002
|
||||
@@ -4,21 +4,27 @@
|
||||
--- quota-tools/warnquota.conf.orig Sat Aug 16 00:54:17 2003
|
||||
+++ quota-tools/warnquota.conf Sat Aug 16 01:00:02 2003
|
||||
@@ -4,21 +4,25 @@
|
||||
# and even blank lines
|
||||
|
||||
# values can be quoted:
|
||||
-MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t"
|
||||
-FROM = "bas@localhost"
|
||||
+MAIL_CMD = "/usr/sbin/sendmail -t"
|
||||
+FROM = "root@localhost"
|
||||
+
|
||||
+FROM =
|
||||
# but they don't have to be:
|
||||
-SUBJECT = Hey, user, clean up your account!
|
||||
-CC_TO = "sysadm@localhost"
|
||||
@ -18,10 +17,9 @@
|
||||
+CC_TO = "root@localhost"
|
||||
+SUPPORT = "root@myhost.com"
|
||||
PHONE = "(123) 456-1111 or (222) 333-4444"
|
||||
+
|
||||
# Text in the beginning of the mail (if not specified, default text is used)
|
||||
# This way text can be split to more lines
|
||||
# Line break are done by '|' character
|
||||
# Line breaks are done by '|' character
|
||||
-MESSAGE = Hello, I've noticed you use too much space\
|
||||
- on my disk|Delete your files on following filesystems:|
|
||||
+#
|
||||
@ -31,9 +29,8 @@
|
||||
# Text in the end of the mail (if not specified, default text using SUPPORT and PHONE
|
||||
# is created)
|
||||
-SIGNATURE = See you!| Your admin|
|
||||
#
|
||||
+SIGNATURE = root@localhost
|
||||
+
|
||||
# end of example warnquota.conf file
|
||||
-#
|
||||
+
|
||||
# Following text is used for mails about group exceeding quotas
|
||||
# It should contain string %s exactly once - it will be substituted for a group name
|
||||
GROUP_MESSAGE = Hello, a group '%s' you're member of use too much space.|\
|
||||
|
||||
40
quota.spec
40
quota.spec
@ -1,28 +1,19 @@
|
||||
Name: quota
|
||||
Summary: System administration tools for monitoring users' disk usage.
|
||||
|
||||
|
||||
######################################################################
|
||||
# Sigh, someone used epoch in the past so now we're stuck with this...
|
||||
#
|
||||
Epoch: 1
|
||||
|
||||
|
||||
Version: 3.06
|
||||
Release: 11
|
||||
Version: 3.10
|
||||
Release: 1
|
||||
License: BSD
|
||||
Group: System Environment/Base
|
||||
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
Requires: kernel >= 2.4 initscripts >= 6.38
|
||||
BuildPreReq: e2fsprogs-devel gettext tcp_wrappers
|
||||
|
||||
|
||||
Source0: http://downloads.sourceforge.net/linuxquota/quota-3.06.tar.gz
|
||||
Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz
|
||||
Patch0: quota-3.06-warnquota.patch
|
||||
Patch1: quota-3.06-no-stripping.patch
|
||||
Patch2: quota-3.06-man-page.patch
|
||||
Patch3: quota-3.09-root_sbindir.patch
|
||||
Patch4: quota-3.06-pie.patch
|
||||
|
||||
|
||||
%description
|
||||
@ -35,6 +26,10 @@ and limiting user and or group disk usage per filesystem.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%ifnarch ppc ppc64
|
||||
%patch4 -p1
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
@ -50,21 +45,15 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8}
|
||||
|
||||
|
||||
make install ROOTDIR=%{buildroot}
|
||||
|
||||
|
||||
install -m 644 warnquota.conf %{buildroot}%{_sysconfdir}
|
||||
|
||||
|
||||
#
|
||||
# we don't support XFS yet
|
||||
#
|
||||
rm -f %{buildroot}%{_sbindir}/quot
|
||||
rm -f %{buildroot}%{_sbindir}/xqmstats
|
||||
rm -f %{buildroot}%{_mandir}/man8/quot.*
|
||||
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
|
||||
@ -75,6 +64,7 @@ rm -rf %{buildroot}
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/warnquota.conf
|
||||
%attr(0644,root,root) %{_sysconfdir}/*
|
||||
%attr(0755,root,root) /sbin/*
|
||||
%attr(0755,root,root) %{_bindir}/*
|
||||
%attr(0755,root,root) %{_sbindir}/*
|
||||
@ -86,6 +76,14 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 27 2004 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
- add -pie support
|
||||
- update to 3.10
|
||||
|
||||
* Sat Aug 16 2003 Steve Dickson <SteveD@RedHat.com>
|
||||
- upgraded to 3.0.9
|
||||
- added quota-3.09-root_sbindir.patch
|
||||
|
||||
* Sun Aug 10 2003 Elliot Lee <sopwith@redhat.com> 3.06-11
|
||||
- Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user