[Fedora-directory-commits] setuputil/specs/SOLARIS setuputil.spec, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/specs/SOLARIS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12433/specs/SOLARIS
Added Files:
setuputil.spec
Log Message:
Resolves: #235477
Summary: Create spec files for SetupUtil
--- NEW FILE setuputil.spec ---
%define nspr_version 4.6
%define nss_version 3.11
%define svrcore_version 4.0
%define mozldap_version 6.0
%define base_name setuputil
%define vndr RHAT
%ifarch sparcv9
%define pkgsuf x
%define mylibdir %{_libdir}/sparcv9
%endif
%ifarch sparc
%define mylibdir %{_libdir}
%endif
Summary: Utility and library for directory server installation
Name: %{vndr}%{base_name}%{pkgsuf}
SUNW_Pkg: %{name}
Version: 1.1.0
Release: 1%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/SetupUtil
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{base_name}-%{version}-%{release}-root-%(/usr/xpg4/bin/id -u -n)
Requires: %{vndr}dirsec-nspr%{pkgsuf}
Requires: %{vndr}dirsec-nss%{pkgsuf}
Requires: %{vndr}svrcore%{pkgsuf}
Requires: %{vndr}mozldap6%{pkgsuf}
BuildRequires: %{vndr}dirsec-nspr%{pkgsuf}-devel
BuildRequires: %{vndr}dirsec-nss%{pkgsuf}-devel
BuildRequires: %{vndr}svrcore%{pkgsuf}-devel
BuildRequires: %{vndr}mozldap6%{pkgsuf}-devel
Source0: %{base_name}-%{version}.tar.bz2
SourcePackage: %{vndr}%{base_name}-src
%description
Installer Utility for Fedora Directory Server
%package devel
SUNW_Pkg: %{name}-devel
Summary: Development libraries for Fedora Directory Server Installer
Group: Development/Libraries
Requires: %{name}
%description devel
Development Libraries and headers for Fedora Directory Server Installer
%prep
%setup -q -n %{base_name}-%{version}
%build
%ifarch sparcv9
arg64="-xarch=v9"
PKG_CONFIG_PATH=%{mylibdir}/pkgconfig ; export PKG_CONFIG_PATH
%endif
# Generate symbolic info for debuggers
export XCFLAGS=$RPM_OPT_FLAGS
CC=cc CFLAGS=$arg64 CXX=CC CXXFLAGS=$arg64 LDFLAGS=$arg64 \
./configure \
--with-fhs \
--libdir=%{mylibdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR="$RPM_BUILD_ROOT" install
mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{base_name}
#remove libtool and static libs
rm -f $RPM_BUILD_ROOT%{mylibdir}/*.a
rm -f $RPM_BUILD_ROOT%{mylibdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,other)
%doc LICENSE EXCEPTION
%attr(-,-,-) %dir %{_prefix}
%attr(-,-,-) %dir %{_libdir}
%ifarch sparcv9
%attr(-,-,-) %dir %{mylibdir}
%endif
%{mylibdir}/*.so.*
%attr(-,-,-) %dir %{_datadir}
%{_datadir}/%{base_name}/*
%attr(-,-,-) %dir %{_sbindir}
%{_sbindir}/*
%files devel
%defattr(-,root,other)
%attr(-,-,-) %dir %{_prefix}
%attr(-,-,-) %dir %{_includedir}
%dir %{_includedir}/%{base_name}
%{_includedir}/%{base_name}/*.h
%attr(-,-,-) %dir %{_libdir}
%ifarch sparcv9
%attr(-,-,-) %dir %{mylibdir}
%endif
%{mylibdir}/*.so
%attr(-,-,-) %dir %{_datadir}
%attr(-,-,-) %dir %{_datadir}/doc
%dir %{_datadir}/doc/%{base_name}
%{_datadir}/doc/%{base_name}/*
%attr(-,-,-) %dir %{mylibdir}/pkgconfig
%{mylibdir}/pkgconfig/%{base_name}.pc
%changelog
* Thu Apr 05 2007 Noriko Hosoi <nhosoi(a)redhat.com> - 1.1.0-1
- Initial version - based largely on fedora-ds.spec for Solaris
17 years
[Fedora-directory-commits] setuputil/specs/RHEL setuputil.spec, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/specs/RHEL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12433/specs/RHEL
Added Files:
setuputil.spec
Log Message:
Resolves: #235477
Summary: Create spec files for SetupUtil
--- NEW FILE setuputil.spec ---
%define nspr_version 4.6
%define nss_version 3.11
%define svrcore_version 4.0
%define mozldap_version 6.0
Summary: Utility and library for directory server installation
Name: setuputil
Version: 1.1.0
Release: 1%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/SetupUtil
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dirsec-nspr-devel >= %{nspr_version}
BuildRequires: dirsec-nss-devel >= %{nss_version}
BuildRequires: svrcore-devel >= %{svrcore_version}
BuildRequires: mozldap6-devel >= %{mozldap_version}
BuildRequires: pkgconfig
Source0: %{name}-%{version}.tar.bz2
%description
%{name} is libraries of functions used to install directory servers.
%package devel
Summary: Development and header files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
BuildRequires: dirsec-nspr-devel >= %{nspr_version}
BuildRequires: dirsec-nss-devel >= %{nss_version}
BuildRequires: svrcore-devel >= %{svrcore_version}
BuildRequires: mozldap6-devel >= %{mozldap_version}
BuildRequires: pkgconfig
%description devel
Development files and header files necessary to build applications
that use %{name}.
%prep
%setup -q
%build
%configure
make
%install
%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_datadir}/%{name}/*
%{_docdir}/%{name}/*
%{_sbindir}/*
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/*.so
%{_includedir}/%{name}/*.h
%changelog
* Wed Apr 05 2007 Noriko Hosoi <nhosoi(a)redhat.com> - 1.1.0-1
- Initial version - based largely on adminutil.spec
17 years
[Fedora-directory-commits] windowsautoenroll/panel ProxyPanel.cs, 1.4, 1.5
by Doctor Conrad
Author: sparkins
Update of /cvs/dirsec/windowsautoenroll/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4147
Modified Files:
ProxyPanel.cs
Log Message:
Corrected placement of version label
Index: ProxyPanel.cs
===================================================================
RCS file: /cvs/dirsec/windowsautoenroll/panel/ProxyPanel.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProxyPanel.cs 30 Mar 2007 00:05:26 -0000 1.4
+++ ProxyPanel.cs 5 Apr 2007 21:59:21 -0000 1.5
@@ -304,7 +304,6 @@
//
// label7
//
- this.label7.Dock = System.Windows.Forms.DockStyle.Top;
this.label7.Location = new System.Drawing.Point(24, 72);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(320, 23);
17 years
[Fedora-directory-commits] setuputil Makefile,1.2,NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3446
Removed Files:
Makefile
Log Message:
Resolves: #234893
Summary: Build SetupUtil with autotools (Comment #19)
Description: Removing the obsolete files (makefile and old spec templates)
--- Makefile DELETED ---
17 years
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.12, 1.13
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12829
Modified Files:
ESC.js
Log Message:
If first attempt at getting issuer info from token fails, try a few more times. Bug # 234884.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ESC.js 3 Apr 2007 20:25:09 -0000 1.12
+++ ESC.js 5 Apr 2007 18:39:52 -0000 1.13
@@ -3351,10 +3351,25 @@
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- url = netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+
+ var tries = 0;
+ while(tries < 3)
+ {
+ url = netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+
+ if(url.length < 10) // Check for bogus junk
+ {
+ recordMessage("Bogus url found ....");
+ url = null;
+ Sleep(150);
+ recordMessage("Going to try again... ");
+ }
+ else
+ break;
+
+ tries ++;
+ }
- if(url.length < 10) // Check for bogus junk
- url = null;
if(url)
{
@@ -3362,7 +3377,26 @@
var result = DoCoolKeySetConfigValue(issuer_config_value,url);
}
} catch (e) {
- ReportException(getBundleString("errorIssuerInfo") + " " , e);
+ recordMessage("Exception attempting to get token issuer info.");
+
+ var tries = 0;
+ while(tries < 3)
+ {
+ url = netkey.GetCoolKeyIssuerInfo(keyType, keyID);
+
+ if(url.length < 10) // Check for bogus junk
+ {
+ recordMessage("Bogus url found from exception....");
+ url = null;
+ sleep(150);
+ recordMessage("From exception. Going to try again... ");
+ }
+ else
+ break;
+
+ tries ++;
+ }
+ recordMessage("From exception returning " + url);
return url;
}
17 years
[Fedora-directory-commits] setuputil/installer/lib Makefile, 1.2, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/installer/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11727/installer/lib
Removed Files:
Makefile
Log Message:
Resolves: #234893
Summary: Build SetupUtil with autotools (Comment #19)
Description: Removing the obsolete files (makefile and old spec templates)
--- Makefile DELETED ---
17 years
[Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.6, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil/installer/unix/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11727/installer/unix/lib
Removed Files:
Makefile
Log Message:
Resolves: #234893
Summary: Build SetupUtil with autotools (Comment #19)
Description: Removing the obsolete files (makefile and old spec templates)
--- Makefile DELETED ---
17 years