OBS User unknown 2007-06-21 20:49:59 +00:00 committed by Git OBS Bridge
parent 81fb893a6d
commit 951c8a14af
14 changed files with 89 additions and 103 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0564bda495eb7ac84aa1a720c10fd34c0d04b5ae1f2934c3ac0fd856ea45cec5
size 3159

View File

@ -1,20 +0,0 @@
--- Makefile.in
+++ Makefile.in
@@ -1,7 +1,7 @@
PROGS = quotacheck quotaon quota quot repquota warnquota quotastats xqmstats edquota setquota convertquota rpc.rquotad
SOURCES = bylabel.c common.c convertquota.c edquota.c pot.c quot.c quota.c quotacheck.c quotacheck_v1.c quotacheck_v2.c quotaio.c quotaio_rpc.c quotaio_v1.c quotaio_v2.c quotaio_xfs.c quotaio_generic.c quotaon.c quotaon_xfs.c quotaops.c quotastats.c quotasys.c repquota.c rquota_client.c rquota_server.c rquota_svc.c setquota.c warnquota.c xqmstats.c svc_socket.c
VERSIONDEF = -DQUOTA_VERSION=\"3.14\"
-CFLAGS = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF)
+CFLAGS = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF) -fPIE
EXT2LIBS = @EXT2LIBS@
RPCSRC = rquota.h rquota_xdr.c rquota_clnt.c
LIBS = @LIBS@
@@ -44,7 +44,7 @@
.PHONY: all clean clobber realclean pot mo inst_mo
.%.d: %.c
- set -e; $(CC) -MM -MG $(CPPFLAGS) $< | \
+ set -e; $(CC) -MM -MG $(CPPFLAGS) $(CFLAGS) $< | \
sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \
[ -s $@ ] || rm -f $@

View File

@ -1,10 +0,0 @@
--- SUSE/quotad
+++ SUSE/quotad
@@ -15,6 +15,7 @@
# Required-Stop: $network
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
+# Short-Description: Start quota daemon.
# Description: Start quota daemon.
### END INIT INFO

View File

@ -1,35 +0,0 @@
--- Makefile.in
+++ Makefile.in
@@ -50,6 +50,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
@@ -126,10 +130,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 $@ $<
@@ -138,7 +142,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 $@ $<

View File

@ -1,15 +0,0 @@
--- quotasys.c
+++ quotasys.c
@@ -366,10 +366,10 @@
if (format)
for (i = 3; i > 0; i--)
if (space >= (1LL << (QUOTABLOCK_BITS*i))*100) {
- sprintf(buf, "%Lu%c", (space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i), suffix[i]);
+ sprintf(buf, "%llu%c", ((space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i)), suffix[i]);
return;
}
- sprintf(buf, "%Lu", space);
+ sprintf(buf, "%llu", space);
}
/*

15
quota-3.14.9-type.patch Normal file
View File

@ -0,0 +1,15 @@
--- quotasys.c
+++ quotasys.c
@@ -367,10 +367,10 @@
if (format)
for (i = 3; i > 0; i--)
if (space >= (1LL << (QUOTABLOCK_BITS*i))*100) {
- sprintf(buf, "%Lu%c", (unsigned long long)(space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i), suffix[i]);
+ sprintf(buf, "%llu%c", (unsigned long long)(space+(1 << (QUOTABLOCK_BITS*i))-1) >> (QUOTABLOCK_BITS*i), suffix[i]);
return;
}
- sprintf(buf, "%Lu", (unsigned long long)space);
+ sprintf(buf, "%llu", (unsigned long long)space);
}
/*

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7adbccea622322f069d15b93592e440c4383e87167417bfc95e672b7df5a1efd
size 201867

3
quota-SUSE.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e000b2b7362fd24aa79a7a9159bf5bf2519ba7cff8d05b582e2521e49ebeac2
size 3416

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2769a880d285a9bf2504bf5c16f6abd9b1b86cbd8059e9337287ed3a0e681c5b
size 258235

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Jun 21 18:48:24 CEST 2007 - lmichnovic@suse.cz
- rewritten headers of init scripts to fulfill LSB
(quota-SUSE.tar.bz2); obsoletes patch lsb
- now starting boot.quota script during boot automatically
FATE #120106
- update to version 3.15 beta
- obsoletes patches: cflags, pie
- netlink feature is disabled now (needs kernel patch)
* implemented quota netlink daemon to listen to kernel netlink
messages and send them to DBUS or write them to the console
* modified configure scripts and warnquota to check for new LDAP
library and allow use of URI
* fix LDAP scripts to set VISUAL instead of EDITOR
* added ext4 filesystem to the list of supported filesystems
* pot.o is now compiled with CFLAGS
* use -fPIE for compilation when available
* fixed some more problems XFS quotaon
* fixed two mistakes in quotaon(8) manpage
* added option -A to quota(1) to report all NFS mountpoints
* fixed XFS handling to work with loopback mounted devices
* fixed mountpoints scanning to make XFS -x delete command work
* fixes of signed vs unsigned int issues
* fixed a format string bug in reporting of raw grace times in repquota
* added repquota(8) and quota(1) option for better parsable output
* fixed error handling in edquota(8) when creating tmp file
-------------------------------------------------------------------
Tue Apr 24 13:07:11 CEST 2007 - lmichnovic@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package quota (Version 3.14)
# spec file for package quota (Version 3.14.9)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,23 +12,20 @@
Name: quota
BuildRequires: e2fsprogs-devel tcpd-devel
Version: 3.14
Release: 30
Version: 3.14.9
Release: 1
PreReq: %insserv_prereq %fillup_prereq
Autoreqprov: on
Group: System/Filesystems
License: GNU General Public License (GPL)
URL: http://sourceforge.net/projects/linuxquota/
Summary: Disk Quota System
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-%{version}-SUSE.tar.gz
Patch0: %{name}-%{version}-mode.diff
Patch1: %{name}-%{version}-man.diff
Patch2: %{name}-%{version}-warnquota.diff
Patch3: %{name}-%{version}-type.diff
Patch4: %{name}-%{version}-pie.diff
Patch5: %{name}-%{version}-cflags.diff
Patch6: %{name}-%{version}-lsb.diff
Source: %{name}-tools-3.14.9.tar.bz2
Source1: %{name}-SUSE.tar.bz2
Patch1: %{name}-%{version}-mode.patch
Patch2: %{name}-%{version}-man.patch
Patch3: %{name}-%{version}-warnquota.patch
Patch4: %{name}-%{version}-type.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -47,13 +44,10 @@ Authors:
%prep
%setup -q -n quota-tools -a 1
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6
find -type d -name CVS -exec rm -rf {} \; -prune
find -type d | xargs chmod 755
@ -62,7 +56,8 @@ find -type d | xargs chmod 755
aclocal --force
autoconf --force
%configure \
--sysconfdir=%{_sysconfdir}
--sysconfdir=%{_sysconfdir} \
--disable-netlink
make CC="gcc"
%install
@ -80,7 +75,10 @@ ln -s ../../etc/init.d/quotad ${RPM_BUILD_ROOT}/usr/sbin/rcquotad
rm -rf $RPM_BUILD_ROOT
%post
%{fillup_and_insserv boot.quota quotad}
%{fillup_and_insserv -y boot.quota quotad}
%preun
%stop_on_removal quotad
%postun
%{insserv_cleanup}
@ -99,6 +97,31 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/*
%changelog
* Thu Jun 21 2007 - lmichnovic@suse.cz
- rewritten headers of init scripts to fulfill LSB
(quota-SUSE.tar.bz2); obsoletes patch lsb
- now starting boot.quota script during boot automatically
FATE #120106
- update to version 3.15 beta
- obsoletes patches: cflags, pie
- netlink feature is disabled now (needs kernel patch)
* implemented quota netlink daemon to listen to kernel netlink
messages and send them to DBUS or write them to the console
* modified configure scripts and warnquota to check for new LDAP
library and allow use of URI
* fix LDAP scripts to set VISUAL instead of EDITOR
* added ext4 filesystem to the list of supported filesystems
* pot.o is now compiled with CFLAGS
* use -fPIE for compilation when available
* fixed some more problems XFS quotaon
* fixed two mistakes in quotaon(8) manpage
* added option -A to quota(1) to report all NFS mountpoints
* fixed XFS handling to work with loopback mounted devices
* fixed mountpoints scanning to make XFS -x delete command work
* fixes of signed vs unsigned int issues
* fixed a format string bug in reporting of raw grace times in repquota
* added repquota(8) and quota(1) option for better parsable output
* fixed error handling in edquota(8) when creating tmp file
* Tue Apr 24 2007 - lmichnovic@suse.cz
- added Short-Description into quotad script to fulfill LSB
specification (lsb.diff)