Browse Source

squid-3.4.6-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8752 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 9 years ago
parent
commit
95062c99eb
2 changed files with 140 additions and 30 deletions
  1. 118 0
      p/perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509-vl.spec
  2. 22 30
      s/squid/squid-vl.spec

+ 118 - 0
p/perl-Crypt-OpenSSL-X509/perl-Crypt-OpenSSL-X509-vl.spec

@@ -0,0 +1,118 @@
+%define pkgname Crypt-OpenSSL-X509
+%define filelist %{pkgname}-%{version}-filelist
+%define NVR %{pkgname}-%{version}-%{release}
+%define maketest 1
+
+Name:      perl-Crypt-OpenSSL-X509
+Summary:   Crypt-OpenSSL-X509 - Perl extension to OpenSSL's X509 API.
+Version:   1.804
+Release:   1%{?_dist_release}
+Vendor:    Project Vine
+Distribution: Vine Linux
+Packager:  tomop
+License:   Artistic
+Group:     Development/Libraries
+URL:       http://www.cpan.org
+buildroot: %{_tmppath}/%{name}-%{version}-%(id -u -n)
+Source:    http://search.cpan.org//CPAN/authors/id/D/DA/DANIEL/Crypt-OpenSSL-X509-%{version}.tar.gz
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires: openssl-devel
+
+%description
+This implement a large majority of OpenSSL's useful X509 API.
+
+  The email() method supports both certificates where the
+  subject is of the form:
+  "... CN=Firstname lastname/emailAddress=user@domain", and also
+  certificates where there is a X509v3 Extension of the form
+  "X509v3 Subject Alternative Name: email=user@domain".
+
+%prep
+%setup -q -n %{pkgname}-%{version} 
+chmod -R u+w %{_builddir}/%{pkgname}-%{version}
+
+%build
+grep -rsl '^#!.*perl' . |
+grep -v '.bak$' |xargs --no-run-if-empty \
+%__perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)'
+CFLAGS="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor `%{__perl} -MExtUtils::MakeMaker -e ' print qq|PREFIX=%{buildroot}%{_prefix}| if \$ExtUtils::MakeMaker::VERSION =~ /5\.9[1-6]|6\.0[0-5]/ '`
+%{__make} 
+%if %maketest
+%{__make} test
+%endif
+
+%install
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+%{makeinstall} `%{__perl} -MExtUtils::MakeMaker -e ' print \$ExtUtils::MakeMaker::VERSION <= 6.05 ? qq|PREFIX=%{buildroot}%{_prefix}| : qq|DESTDIR=%{buildroot}| '`
+
+cmd=/usr/share/spec-helper/compress_files
+[ -x $cmd ] || cmd=/usr/lib/rpm/brp-compress
+[ -x $cmd ] && $cmd
+
+# SuSE Linux
+if [ -e /etc/SuSE-release -o -e /etc/UnitedLinux-release ]
+then
+    %{__mkdir_p} %{buildroot}/var/adm/perl-modules
+    %{__cat} `find %{buildroot} -name "perllocal.pod"`  \
+        | %{__sed} -e s+%{buildroot}++g                 \
+        > %{buildroot}/var/adm/perl-modules/%{name}
+fi
+
+# remove special files
+find %{buildroot} -name "perllocal.pod" \
+    -o -name ".packlist"                \
+    -o -name "*.bs"                     \
+    |xargs -i rm -f {}
+
+# no empty directories
+find %{buildroot}%{_prefix}             \
+    -type d -depth                      \
+    -exec rmdir {} \; 2>/dev/null
+
+%{__perl} -MFile::Find -le '
+    find({ wanted => \&wanted, no_chdir => 1}, "%{buildroot}");
+    print "%doc  TODO inc Changes README certs";
+    for my $x (sort @dirs, @files) {
+        push @ret, $x unless indirs($x);
+        }
+    print join "\n", sort @ret;
+
+    sub wanted {
+        return if /auto$/;
+
+        local $_ = $File::Find::name;
+        my $f = $_; s|^\Q%{buildroot}\E||;
+        return unless length;
+        return $files[@files] = $_ if -f $f;
+
+        $d = $_;
+        /\Q$d\E/ && return for reverse sort @INC;
+        $d =~ /\Q$_\E/ && return
+            for qw|/etc %_prefix/man %_prefix/bin %_prefix/share|;
+
+        $dirs[@dirs] = $_;
+        }
+
+    sub indirs {
+        my $x = shift;
+        $x =~ /^\Q$_\E\// && $x ne $_ && return 1 for @dirs;
+        }
+    ' > %filelist
+
+[ -z %filelist ] && {
+    echo "ERROR: empty %files listing"
+    exit -1
+    }
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+%files -f %filelist
+%defattr(-,root,root)
+
+%changelog
+* Mon Jul  7 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.804-1
+- Initial build.

+ 22 - 30
s/squid/squid-vl.spec

@@ -1,6 +1,6 @@
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     3.1.23
+%define         pkg_version     3.4.6
 %define         pkg_release     1%{?_dist_release}
 %define         uid             23
 %define         gid             23
@@ -11,7 +11,7 @@ Name:           %{base_name}
 Epoch:          %{pkg_epoch}
 Version:        %{pkg_version}
 Release:        %{pkg_release}
-Source0:        %{base_name}-%{version}.tar.bz2
+Source0:        %{base_name}-%{version}.tar.xz
 Source1:        %{base_name}.init
 Source2:        %{base_name}.logrotate
 Source3:        %{base_name}.sysconfig
@@ -71,22 +71,22 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --datadir=%{_datadir}/%{base_name} \
    --disable-dependency-tracking \
    --enable-arp-acl \
-   --enable-auth="basic,digest,ntlm,negotiate" \
-   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
+   --enable-auth \
+   --enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
+   --enable-auth-digest="file,LDAP,eDirectory" \
+   --enable-auth-negotiate="kerberos" \
+   --enable-auth-ntlm="smb_lm,fake" \
+   --enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
-   --enable-digest-auth-helpers="password" \
    --enable-epoll \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
    --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="smb_lm,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
@@ -203,34 +203,23 @@ fi
 
 # Program Files
 %attr(0755,root,root) %{_sbindir}/%{base_name}
-%attr(0755,root,root) %{_bindir}/squidclient
+%attr(0755,root,root) %{_bindir}/*
 
 %attr(0755,root,root) %{_initdir}/%{base_name}
 
 %attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_pw_auth
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/basic_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/cert_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/diskd
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/fakeauth_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/getpwname_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ip_user_check
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/msnt_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ncsa_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_kerb_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_kerb_auth_test
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_smb_lm_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/pam_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/sasl_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth.pl
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth.sh
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_kerb_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_kerb_auth_test
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_ldap_auth
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_ldap_group
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_unix_group
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ext_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/helper*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/log_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_*
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/wbinfo_group.pl
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/yp_auth
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
 
 # Config Files
 %attr(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
@@ -263,6 +252,9 @@ fi
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
 %changelog
+* Mon Jul  7 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.6-1
+- new upstream release.
+
 * Sat Jan 12 2013 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.23-1
 - new upstream release