May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-packager
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Thu May 25 00:54:50 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-16 15:50:15.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-05-24 13:39:03.000000000 +0200 @@ -1,0 +2,20 @@ +Wed May 24 12:54:33 CEST 2006 - jsrain(a)suse.cz + +- properly integrate YCP code for add-on product installation if + add-on product media booted (if YCP code present) (#178311) +- 2.13.119 + +------------------------------------------------------------------- +Fri May 19 10:35:24 CEST 2006 - jsrain(a)suse.cz + +- store ProductFeatures before starting package installation + (#176993) +- 2.13.118 + +------------------------------------------------------------------- +Wed May 17 10:53:12 CEST 2006 - jsrain(a)suse.cz + +- decode %2f from FTP path from install.inf (#169310) +- 2.13.117 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.116.tar.bz2 New: ---- yast2-packager-2.13.119.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.miL3eY/_old 2006-05-25 00:54:38.000000000 +0200 +++ /var/tmp/diff_new_pack.miL3eY/_new 2006-05-25 00:54:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.116) +# spec file for package yast2-packager (Version 2.13.119) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.116 +Version: 2.13.119 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.116.tar.bz2 +Source0: yast2-packager-2.13.119.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.116 +%setup -n yast2-packager-2.13.119 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,17 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed May 24 2006 - jsrain(a)suse.cz +- properly integrate YCP code for add-on product installation if + add-on product media booted (if YCP code present) (#178311) +- 2.13.119 +* Fri May 19 2006 - jsrain(a)suse.cz +- store ProductFeatures before starting package installation + (#176993) +- 2.13.118 +* Wed May 17 2006 - jsrain(a)suse.cz +- decode %%2f from FTP path from install.inf (#169310) +- 2.13.117 * Tue May 16 2006 - jsrain(a)suse.cz - don't use patterns required by product during autoinstallation (#159466) ++++++ yast2-packager-2.13.116.tar.bz2 -> yast2-packager-2.13.119.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/VERSION new/yast2-packager-2.13.119/VERSION --- old/yast2-packager-2.13.116/VERSION 2006-05-16 15:40:05.000000000 +0200 +++ new/yast2-packager-2.13.119/VERSION 2006-05-24 13:04:23.000000000 +0200 @@ -1 +1 @@ -2.13.116 +2.13.119 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/configure new/yast2-packager-2.13.119/configure --- old/yast2-packager-2.13.116/configure 2006-05-16 15:48:07.000000000 +0200 +++ new/yast2-packager-2.13.119/configure 2006-05-24 13:36:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.116. +# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.119. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.13.116' -PACKAGE_STRING='yast2-packager 2.13.116' +PACKAGE_VERSION='2.13.119' +PACKAGE_STRING='yast2-packager 2.13.119' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.13.116 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.119 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.13.116:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.119:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.13.116 +yast2-packager configure 2.13.119 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.13.116, which was +It was created by yast2-packager $as_me 2.13.119, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.13.116' + VERSION='2.13.119' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.116" +VERSION="2.13.119" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-packager $as_me 2.13.116, which was +This file was extended by yast2-packager $as_me 2.13.119, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.13.116 +yast2-packager config.status 2.13.119 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/configure.in new/yast2-packager-2.13.119/configure.in --- old/yast2-packager-2.13.116/configure.in 2006-05-16 15:48:03.000000000 +0200 +++ new/yast2-packager-2.13.119/configure.in 2006-05-24 13:36:16.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.116, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.119, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.116" +VERSION="2.13.119" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.13.116/src/clients/inst_kickoff.ycp 2006-05-11 13:45:48.000000000 +0200 +++ new/yast2-packager-2.13.119/src/clients/inst_kickoff.ycp 2006-05-19 10:03:12.000000000 +0200 @@ -24,6 +24,7 @@ import "Kernel"; import "Arch"; import "FileUtils"; + import "ProductFeatures"; void AcpiToInitrd () { if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) @@ -392,5 +393,14 @@ SCR::Execute (.target.bash, "/bin/echo \"/etc/nothing\" >/proc/sys/kernel/modprobe"); } + if (Stage::initial ()) + { + ProductFeatures::Save(); + WFM::Execute (.local.bash, sformat ( + "/bin/mkdir -p %1/etc/YaST2", Installation::destdir)); + WFM::Execute (.local.bash, sformat ( + "/bin/cp %1 %2/%1", "/etc/YaST2/ProductFeatures", Installation::destdir)); + } + return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/InstURL.ycp new/yast2-packager-2.13.119/src/modules/InstURL.ycp --- old/yast2-packager-2.13.116/src/modules/InstURL.ycp 2006-05-03 14:05:56.000000000 +0200 +++ new/yast2-packager-2.13.119/src/modules/InstURL.ycp 2006-05-17 10:53:46.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Convert /etc/install.inf data to URL * * - * $Id: InstURL.ycp 29680 2006-04-04 17:34:37Z jsrain $ + * $Id: InstURL.ycp 30961 2006-05-17 08:53:41Z jsrain $ */ { @@ -233,6 +233,8 @@ // ftp://foo/bar is bar on foo (absolute) // ftp://foo//bar is /bar on foo (relative) // Note: %2f is added by URL.ycp if the path starts with / + if (substring (serverdir, 0, 3) == "%2f") + serverdir = "/" + substring (serverdir, 3); fs = serverdir; } else if (instmode == "smb" && (share != nil) && (share != "")) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.116/src/modules/Packages.ycp new/yast2-packager-2.13.119/src/modules/Packages.ycp --- old/yast2-packager-2.13.116/src/modules/Packages.ycp 2006-05-16 15:34:50.000000000 +0200 +++ new/yast2-packager-2.13.119/src/modules/Packages.ycp 2006-05-24 12:55:18.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 30943 2006-05-16 13:34:43Z jsrain $ + * $Id: Packages.ycp 31125 2006-05-24 10:55:12Z jsrain $ */ { @@ -639,7 +639,12 @@ { AddOnProduct::WFIntegrate (spdir + "/installation.xml"); } + if ((integer)WFM::Read (.local.size, spdir + "/y2update.tgz") > 0) + { + AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz"); + } string sp_url = "dir:" + spdir; + PackageCallbacksInit::InitPackageCallbacks (); integer sp_source = Pkg::SourceCreate (sp_url, ""); if (sp_source == -1) Report::Error (_("Failed to integrate service pack source.")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yakuake
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package yakuake checked in at Thu May 25 00:54:31 CEST 2006. -------- --- KDE/yakuake/yakuake.changes 2006-03-27 13:52:53.000000000 +0200 +++ yakuake/yakuake.changes 2006-05-24 19:21:26.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 19:21:21 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yakuake.spec ++++++ --- /var/tmp/diff_new_pack.FhDSVp/_old 2006-05-25 00:54:16.000000000 +0200 +++ /var/tmp/diff_new_pack.FhDSVp/_new 2006-05-25 00:54:16.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: yakuake is a terminal for KDE Version: 2.7.5 -Release: 1 +Release: 8 Source: %{name}-%{version}.tar.bz2 Source1: yakuake.desktop @@ -44,7 +44,11 @@ %install . /etc/opt/kde3/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET +%if %suse_version < 1010 +%suse_update_desktop_file %name System TerminalEmulator +%else %suse_update_desktop_file -G "Terminal Program" %name System TerminalEmulator +%endif %post %{run_ldconfig} @@ -65,6 +69,8 @@ /opt/kde3/share/locale/*/LC_MESSAGES/*.mo %changelog -n yakuake +* Wed May 24 2006 - adrian(a)suse.de +- fix build for < 10.1 * Mon Mar 27 2006 - dkukawka(a)suse.de - updated to new upstream version 2.7.5: - Further translations have been added. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit varmon
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package varmon checked in at Thu May 25 00:54:28 CEST 2006. -------- --- varmon/varmon.changes 2006-01-25 21:42:30.000000000 +0100 +++ varmon/varmon.changes 2006-05-24 23:10:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 23:09:58 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- makefile.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ varmon.spec ++++++ --- /var/tmp/diff_new_pack.MMDugI/_old 2006-05-25 00:54:14.000000000 +0200 +++ /var/tmp/diff_new_pack.MMDugI/_new 2006-05-25 00:54:14.000000000 +0200 @@ -1,26 +1,26 @@ # # spec file for package varmon (Version 1.0.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: varmon Summary: Mylex DAC960 RAID Controller Monitoring Tool - License: GPL Group: Hardware/Other Autoreqprov: on Version: 1.0.2 -Release: 575 +Release: 587 Source: varmon-1.0.2.tar.gz Patch: varmon-1.0.2.dif Patch1: gcc4.dif +Patch2: makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,23 +38,27 @@ %setup -n varmon-1.0.2 %patch %patch1 +%patch2 rm -f varmon %build -make +make CFLAGS="$RPM_OPT_FLAGS" %install -test -n "$RPM_BUILD_ROOT" && rm -Rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/sbin install varmon $RPM_BUILD_ROOT/sbin/ %clean +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /sbin/varmon %changelog -n varmon +* Wed May 24 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Apr 24 2005 - aj(a)suse.de ++++++ makefile.diff ++++++ --- Makefile +++ Makefile @@ -3,10 +3,9 @@ # Author Dragan Stancevic <visitor(a)valinux.com> strip: varmon - strip varmon varmon: olddel - gcc -o varmon varmon.c -Wall -lncurses + gcc -o varmon varmon.c -Wall $(CFLAGS) -lncurses static: varmon_st strip varmon ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit smb4k
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package smb4k checked in at Thu May 25 00:53:56 CEST 2006. -------- --- KDE/smb4k/smb4k.changes 2006-05-16 12:07:37.000000000 +0200 +++ smb4k/smb4k.changes 2006-05-24 11:46:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 11:46:51 CEST 2006 - adrian(a)suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.kviUtm/_old 2006-05-25 00:53:21.000000000 +0200 +++ /var/tmp/diff_new_pack.kviUtm/_new 2006-05-25 00:53:21.000000000 +0200 @@ -12,11 +12,14 @@ Name: smb4k BuildRequires: kdebase3-devel +%if %suse_version < 1010 +BuildRequires: update-desktop-files +%endif License: GPL Group: Productivity/Networking/Samba Summary: extended SMB and CIFS share browser for KDE Version: 0.7.0 -Release: 2 +Release: 4 URL: http://smb4k.berlios.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 @@ -73,6 +76,8 @@ /opt/kde3/share/icons/* %changelog -n smb4k +* Wed May 24 2006 - adrian(a)suse.de +- fix build for < 10.1 * Tue May 02 2006 - stbinner(a)suse.de - 0.7 update * KonqSidebar_Smb4K: hang up the new alreadyMountedShare signal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scarse
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package scarse checked in at Thu May 25 00:53:09 CEST 2006. -------- --- scarse/scarse.changes 2006-01-27 02:25:02.000000000 +0100 +++ scarse/scarse.changes 2006-05-24 22:01:15.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:01:09 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- scarse-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scarse.spec ++++++ --- /var/tmp/diff_new_pack.lDNROc/_old 2006-05-25 00:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.lDNROc/_new 2006-05-25 00:53:00.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: scarse BuildRequires: libtiff-devel Version: 0.4.alpha -Release: 3 +Release: 14 %define _version 0.4 %define __version 0.4-alpha URL: http://www.scarse.org/ @@ -24,6 +24,7 @@ Patch: scarse-0.4-alpha-gcc4.patch Patch1: scarse-icclib-fix.patch Patch2: scarse-0.4-alpha-integer.patch +Patch3: scarse-strip.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,7 @@ %patch %patch1 %patch2 +%patch3 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -52,7 +54,6 @@ make %{?jobs:-j %jobs} %install -rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT/usr install mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/icclib cp CHANGES COPYING CREDITS INSTALL README TODO $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} @@ -68,6 +69,8 @@ /usr/share/scarse %changelog -n scarse +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 24 2006 - mmarek(a)suse.cz ++++++ scarse-strip.patch ++++++ --- src/Makefile.in +++ src/Makefile.in @@ -64,7 +64,7 @@ install: $(bins) $(INSTALL) -d $(bindir) - $(INSTALL) -s $(bins) $(bindir) + $(INSTALL) $(bins) $(bindir) $(UXP) $(addprefix $(bindir)/, $(bins)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ruby-ldap
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package ruby-ldap checked in at Thu May 25 00:53:05 CEST 2006. -------- --- ruby-ldap/ruby-ldap.changes 2006-01-25 21:41:15.000000000 +0100 +++ ruby-ldap/ruby-ldap.changes 2006-05-24 07:18:56.000000000 +0200 @@ -1,0 +2,37 @@ +Wed May 24 07:00:28 CEST 2006 - mrueckert(a)suse.de + +- Update to version 0.9.5 + o The software now builds and works out of the box on Windows. + + Changes from 0.9.4: + o Modify LDAP::Conn#search, LDAP::Conn#search2, + LDAP::Conn#search_ext and LDAP::Conn#search_ext2 to treat + LDAP_SIZELIMIT_EXCEEDED as success. After using any of these + four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. + If true, the results set has been truncated by the server. + Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception + and no results would be returned, which is not the correct + behaviour if the user has deliberately put a limit on the + number of results to be returned, in order to spare the + server. + o Duplicate code refactored. + o Missing RDoc documentation added for LDAP::Conn#err. + + Changes from 0.9.3 + o LDAP::Schema#names and LDAP::Schema#attr will now allow + names with hyphens and/or underscores. + o Silence a warning about @sasl_quiet when run in debug mode. + o Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. + o Build properly with OpenLDAP 2.3. + o Build-time options --with-ldap-incdir and --with-ldap-libdir + have been replaced by --with-ldap-include and --with-ldap-lib. + This is a consequence of making extconf.rb more standard. + o Windows build has been improved, so that it should now at least + build without error. Whether it will work is another matter. + +- removed ruby-ldap-0.9.2_ldapapi.patch: + this patch is no longer needed + +------------------------------------------------------------------- Old: ---- ruby-ldap-0.9.2.tar.gz ruby-ldap-0.9.2_ldapapi.patch New: ---- ruby-ldap-0.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-ldap.spec ++++++ --- /var/tmp/diff_new_pack.9UF5dN/_old 2006-05-25 00:52:47.000000000 +0200 +++ /var/tmp/diff_new_pack.9UF5dN/_new 2006-05-25 00:52:47.000000000 +0200 @@ -1,25 +1,28 @@ # -# spec file for package ruby-ldap (Version 0.9.2) +# spec file for package ruby-ldap (Version 0.9.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: ruby-ldap -BuildRequires: openldap2 openldap2-devel ruby-devel -Version: 0.9.2 +Version: 0.9.5 Release: 1 +# License: BSD Group: Development/Languages/Ruby +# BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: openldap2 openldap2-devel ruby-devel +# URL: http://sourceforge.net/projects/ruby-ldap/ -Source: http://rdownload.sourceforge.net/ruby-ldap/%{name}-%{version}.tar.gz -Patch: ruby-ldap-0.9.2_ldapapi.patch +Source: http://prdownloads.sourceforge.net/ruby-ldap/%{name}-%{version}.tar.gz +# Summary: A Ruby extension library for accessing the LDAP API %description @@ -38,7 +41,6 @@ %prep %setup -%patch %build ruby extconf.rb \ @@ -68,6 +70,37 @@ %doc example/ test/ rdoc/ %changelog -n ruby-ldap +* Wed May 24 2006 - mrueckert(a)suse.de +- Update to version 0.9.5 + o The software now builds and works out of the box on Windows. + Changes from 0.9.4: + o Modify LDAP::Conn#search, LDAP::Conn#search2, + LDAP::Conn#search_ext and LDAP::Conn#search_ext2 to treat + LDAP_SIZELIMIT_EXCEEDED as success. After using any of these + four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. + If true, the results set has been truncated by the server. + Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception + and no results would be returned, which is not the correct + behaviour if the user has deliberately put a limit on the + number of results to be returned, in order to spare the + server. + o Duplicate code refactored. + o Missing RDoc documentation added for LDAP::Conn#err. + Changes from 0.9.3 + o LDAP::Schema#names and LDAP::Schema#attr will now allow + names with hyphens and/or underscores. + o Silence a warning about @sasl_quiet when run in debug mode. + o Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. + o Build properly with OpenLDAP 2.3. + o Build-time options --with-ldap-incdir and --with-ldap-libdir + have been replaced by --with-ldap-include and --with-ldap-lib. + This is a consequence of making extconf.rb more standard. + o Windows build has been improved, so that it should now at least + build without error. Whether it will work is another matter. +- removed ruby-ldap-0.9.2_ldapapi.patch: + this patch is no longer needed * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Nov 18 2005 - mrueckert(a)suse.de ++++++ ruby-ldap-0.9.2.tar.gz -> ruby-ldap-0.9.5.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/ChangeLog new/ruby-ldap-0.9.5/ChangeLog --- old/ruby-ldap-0.9.2/ChangeLog 2005-07-07 10:28:33.000000000 +0200 +++ new/ruby-ldap-0.9.5/ChangeLog 2006-04-20 18:47:42.000000000 +0200 @@ -1,3 +1,119 @@ +Thu Apr 20 16:47:00 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.5. + +Thu Apr 20 16:39:46 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_compare_ext_s): The call to ldap_compare_ext_s() + requires an extra argument on Windows platforms. + +Thu Apr 20 16:34:21 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * win/winldap.h: Change prototype for ldap_compare_ext_s() to include + extra parameter expected on Windows platforms. + +Wed Apr 19 22:13:26 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): Fix function definition to + silence compiler warning. + +Tue Apr 18 23:40:24 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): Function definition was missing + an argument. + * sslconn.c (rb_ldap_sslconn_bind_s): Erroneously called + rb_ldap_sslconn_bind_func() instead of rb_ldap_sslconn_bind_f(). + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Erroneously called + rb_ldap_sslconn_bind_func() instead of rb_ldap_sslconn_bind_f(). + +Tue Mar 7 23:49:57 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.4. + +Tue Mar 7 21:03:01 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_ext_s): Modify LDAP::Conn#search_ext to + treat a return value of LDAP_SIZELIMIT_EXCEEDED from + rb_ldap_conn_search_ext_i() as success. + * conn.c (rb_ldap_conn_search_ext2_s): Ditto for + LDAP::Conn#search_ext2. + +Mon Mar 6 01:33:10 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_f): New function containing + identical code from rb_ldap_sslconn_bind_s() and + rb_ldap_sslconn_simple_bind_s(). The new function takes a function + pointer as its last parameter, to decide whether to call + rb_ldap_conn_bind_s() or rb_ldap_conn_simple_bind_s(), as previously + called by rb_ldap_sslconn_bind_s() and + rb_ldap_sslconn_simple_bind_s(), respectively. + * sslconn.c (rb_ldap_sslconn_bind_s): Code moved to + rb_ldap_sslconn_bind_f(). + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Code moved to + rb_ldap_sslconn_bind_f(). + +Mon Mar 6 00:28:38 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_i): Give a clearer exception message + when a call to either ldap_search_s(3) or ldap_search_st(3) returns + no pointer to a result. + +Thu Mar 2 12:12:58 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_search_s): Modify LDAP::Conn#search to treat a + return value of LDAP_SIZELIMIT_EXCEEDED from rb_ldap_conn_search_i() + as success. + * conn.c (rb_ldap_conn_search2_s): Ditto for LDAP::Conn#search2. + * rbldap.h: Check_LDAP_Result macro modifed to treat + LDAP_SIZELIMIT_EXCEEDED as success. + +Thu Mar 2 11:54:22 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c: RDoc documentation was missing for LDAP::Conn#err. + +Sat Feb 18 09:37:14 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * Version 0.9.3 + +Thu Feb 16 01:15:59 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * extconf.rb: Build with -DLDAP_DEPRECATED to enable functions no + longer automatically defined by ldap.h in OpenLDAP 2.3. + +Mon Feb 13 17:20:32 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_bind_s): Use RB_LDAP_DATA instead of struct + rb_ldap_data. + * conn.c (rb_ldap_conn_simple_bind_s): Ditto. + * conn.c (rb_ldap_conn_bound): Ditto. + * saslconn.c (rb_ldap_conn_sasl_bind): Ditto. + +Mon Feb 13 17:10:08 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * sslconn.c (rb_ldap_sslconn_bind_s): In LDAP::SSLConn#bind, ldapdata + was used uninitialised. + * sslconn.c (rb_ldap_sslconn_simple_bind_s): Ditto for + LDAP::SSLConn#simple_bind. + +Sun Feb 12 20:33:28 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c (rb_ldap_conn_s_allocate): Silence a warning about + @sasl_quiet when run in debug mode. + +Sun Feb 12 17:28:14 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * extconf.rb: Common directory scheme of mkmf.rb is now used. As a + side-effect, --with-ldap-incdir has been replaced by + --with-ldap-include and --with-ldap-libdir has been replaced by + --with-ldap-lib. Thanks to Usa Nakamura <usa(a)garbagecollect.jp>. + * extconf.rb: Display text was improved and grammatical errors were + corrected. + +Sun Feb 12 17:08:17 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * conn.c: Make inclusion of sys/time.h and unistd.h conditional on + macro defines. Thanks to Usa Nakamura <usa(a)garbagecollect.jp>. + * saslconn.c: Ditto. + * sslconn.c: Ditto. + +Sun Feb 12 16:59:06 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * win/winldap.h: Fix up various structs for Windows. Thanks to Usa + Nakamura <usa(a)garbagecollect.jp> for the patch. + +Thu Feb 8 23:15:17 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * lib/ldap/schema.rb: Allow LDAP::Schema#attr to find attribute names + that contain hyphens and/or underscores. + * lib/ldap/schema.rb: Fix LDAP::Schema#names to not allow all manner + of extra characters in names. That was introduced by the last change. + +Thu Feb 8 22:59:07 UTC 2006 Ian Macdonald <ian(a)caliban.org> + * lib/ldap/schema.rb: Relax parsing in LDAP::Schema#names to allow + names with hyphens and/or underscores. This is apparently an issue + with the Sun LDAP server. Thanks to Tilo Sloboda <tilo(a)unixgods.org> + for pointing out the issue. + Tue Jul 5 19:14:38 UTC 2005 Ian Macdonald <ian(a)caliban.org> * Version 0.9.2 * conn.c (rb_ldap_conn_perror): str was not declared, but is needed @@ -26,7 +142,7 @@ rb_ldap_conn_initialize() for a Conn object or rb_ldap_sslconn_initialize() for an SSLConn object, passing in the original arguments. - * conn.c (rb_ldap_conn_bind_s): In LDAP::Conn#bind, all + * conn.c (rb_ldap_conn_bind_s): In LDAP::Conn#bind, allow rb_ldap_conn_rebind() to rebind a connection that has been unbound. * conn.c (rb_ldap_conn_simple_bind_s): Ditto for LDAP::Conn#simple_bind. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/FAQ new/ruby-ldap-0.9.5/FAQ --- old/ruby-ldap-0.9.2/FAQ 2005-02-08 02:55:09.000000000 +0100 +++ new/ruby-ldap-0.9.5/FAQ 2006-03-02 13:40:34.000000000 +0100 @@ -1,25 +1,49 @@ -FAQ -- +$Id: FAQ,v 1.5 2006/03/02 12:40:34 ianmacd Exp $ -[Q] How do I add/modify binary data? -[A] Create a LDAP::Mod object with the flag LDAP::LDAP_MOD_BVALUES as follows: - entry = [ - LDAP::mod(LDAP::LDAP_MOD_ADD|LDAP_MOD_BVALUES, 'jpegPhoto', [jpeg_img]), - LDAP::mod(LDAP::LDAP_MOD_ADD, 'cn', ['Takaaki Tateishi']), - ... - ] - conn.add("dc=localhost, dc=localdomain", entry) - - -[Q] Is there shortcut method for adding/modifying entries. -[A] Yes, there is. You can directly give LDAP::Conn#add/modify hash data as follows: - - entry = { - 'objectclass' => ['top', 'person'], - ... - } - conn.add("cn=foobar, dc=localhost, dc=localdomain", entry) - -[Q] Can I use SASL authentication? -[A] Yes, it works for me using Cyrus SASL and Kerberos V via GSSAPI. - Use LDAP::Conn#sasl_bind. +FAQ +--- + +Q. How do I add/modify binary data? +A. Create a LDAP::Mod object with the flag LDAP::LDAP_MOD_BVALUES as follows: + + entry = [ + LDAP::mod(LDAP::LDAP_MOD_ADD|LDAP_MOD_BVALUES, 'jpegPhoto', [jpeg_img]), + LDAP::mod(LDAP::LDAP_MOD_ADD, 'cn', ['Takaaki Tateishi']), + ... + ] + conn.add("dc=localhost, dc=localdomain", entry) + +Q. Is there shortcut method for adding/modifying entries. +A. Yes, there is. You can directly give LDAP::Conn#add/modify hash data as + follows: + + entry = { + 'objectclass' => [ 'top', 'person' ], + ... + } + conn.add( "cn=foobar, dc=localhost, dc=localdomain", entry ) + +Q. Can I use SASL authentication? +A. Yes, it works for me using Cyrus SASL and Kerberos V via GSSAPI. + Use LDAP::Conn#sasl_bind. Your mileage may vary. + +Q. Can I put a limit on the number of results returned by the server? +A. Yes, you can. Set the size limit using LDAP::Conn#set_option and then + check for LDAP::Conn#search or LDAP::Conn#search2 having exceeded this + limit, by using LDAP::Conn#err: + + conn = LDAP::Conn.new( 'localhost', 389 ) + # Limit the results set to a maximum of 10. + conn.set_option( LDAP::LDAP_OPT_SIZELIMIT, 10 ) + conn.search2( 'dc=localhost,dc=localdomain', + LDAP::LDAP_SCOPE_SUBTREE, '(objectClass=*)' ) + if conn.err == LDAP::LDAP_SIZELIMIT_EXCEEDED + # Results set was truncated by server. + end + + Note that LDAP::LDAP_SIZELIMIT_EXCEEDED may occur even when you have not + put an explicit limit on the number of results to be returned. The server + will likely have its own maximum configured, so it can be important to + check for this condition on all of your calls to LDAP::Conn#search and + LDAP::Conn#search2. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/MANIFEST new/ruby-ldap-0.9.5/MANIFEST --- old/ruby-ldap-0.9.2/MANIFEST 2005-02-08 02:48:56.000000000 +0100 +++ new/ruby-ldap-0.9.5/MANIFEST 2006-02-18 10:33:20.000000000 +0100 @@ -2,6 +2,7 @@ COPYING FAQ MANIFEST +NEWS README TODO conn.c @@ -10,7 +11,6 @@ example/cgi/search.html example/pr_ctl extconf.rb -install.rb ldap.c lib/ldap/control.rb lib/ldap/ldif.rb @@ -42,7 +42,12 @@ test/search2.rb test/search3.rb test/subschema.rb +test/tc_conn.rb +test/tc_ldif.rb +test/tc_schema.rb +test/tc_search.rb test/test.sh +test/ts_ldap.rb win/winlber.h win/winldap.h win/wldap32.def diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/NOTES new/ruby-ldap-0.9.5/NOTES --- old/ruby-ldap-0.9.2/NOTES 1970-01-01 01:00:00.000000000 +0100 +++ new/ruby-ldap-0.9.5/NOTES 2006-04-20 18:42:57.000000000 +0200 @@ -0,0 +1,48 @@ +0.9.5 +----- + +The Windows build is now believed to work out of the box. It has been tested +on Windows XP SP2, using SVC C++ 6.0 to build the software. Thanks to Chris +Scharf <scharfie(a)gmail.com> for his work in this area and willingness to work +with me on fixing the problems. + + +0.9.4 +----- + +LDAP::Conn#search, LDAP::Conn#search2, LDAP::Conn#search_ext and +LDAP::Conn#search_ext2 have been modified to treat LDAP_SIZELIMIT_EXCEEDED as +success. + +After using any of these four methods, the user should use LDAP::Conn#err to +check whether the error status of the Conn object is +LDAP::LDAP_SIZELIMIT_EXCEEDED. If true, the results set has been truncated by +the server. + +Previously, LDAP_SIZELIMIT_EXCEEDED would raise an exception and no results +would be returned, which is not the correct behaviour if the user has +deliberately put a limit on the number of results to be returned, as might be +done in order to spare the server. + + +0.9.3 +----- + +The usability of the library on Windows platforms is currently a case of 'suck +it and see'. Some people report the code working, others report immediate +segfaults; yet others say that it worked after they made some minor +alterations to the code in order to get it to build. + +Differences in Windows platform used, chosen compiler and version, plus the +variety of servers with which the code is used, conspire to result in the +exact facts of the matter not yet having been ascertained. + +Most people seemed to experience some difficulty in getting the code to build +on Windows, so some effort has gone into making this better for the 0.9.3 +release. This work is difficult, since I do not have a Windows build +environment at my disposal. + +If you are a Windows user and you found that the code did not work in its +original form, but you managed to get it to work after some alterations, I +would be very grateful if you wrote to me to let me know what changes were +needed. Please include precise details of your build platform. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/README new/ruby-ldap-0.9.5/README --- old/ruby-ldap-0.9.2/README 2005-03-08 11:20:19.000000000 +0100 +++ new/ruby-ldap-0.9.5/README 2006-04-20 00:21:14.000000000 +0200 @@ -1,7 +1,9 @@ Ruby/LDAP -- A Ruby extension library for LDAP - + +$Id: README,v 1.18 2006/04/19 22:21:14 ianmacd Exp $ + Copyright (C) 2000-2004 Takaaki Tateishi <ttate(a)users.sourceforge.net> -Copyright (C) 2005 Ian Macdonald <ian(a)caliban.org> +Copyright (C) 2005-2006 Ian Macdonald <ian(a)caliban.org> ------------------------------------------------------------------------------- DESCRIPTION @@ -13,7 +15,7 @@ REQUIREMENT * Ruby 1.8.x (at least 1.8.2 if you want to use ldap/control) - * OpenLDAP, NetscapeSDK, Windows2000 (or ADSI) + * OpenLDAP, Netscape SDK, Windows 2003 or Windows XP ------------------------------------------------------------------------------- @@ -26,20 +28,20 @@ BUILDING -extconf.rb will try to use OpenLDAP2 or NetscapeSDK libraries and guess paths -to some header files and libraries from the position of ldap.h. If you'd like -to see the available options for extconf.rb, run it with '--help' option. +extconf.rb will try to use the OpenLDAP 2 or Netscape SDK libraries and guess +paths to some header files and libraries from the position of ldap.h. If you'd +like to see the available options for extconf.rb, run it with '--help' option. $ ruby extconf.rb [--with-openldap1|--with-openldap2|--with-netscape|--with-wldap32] $ make -You will get ldap.so, which you can either manually copy into place or type: +This will create ldap.so, which you can either manually copy into place or +install with: $ make install -If you have a binary distribution, execute install.rb as follows: - - $ ruby install.rb +If you're building the software on Windows, you may need to use nmake instead +of make. ------------------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/conn.c new/ruby-ldap-0.9.5/conn.c --- old/ruby-ldap-0.9.2/conn.c 2005-07-05 21:14:38.000000000 +0200 +++ new/ruby-ldap-0.9.5/conn.c 2006-04-20 18:39:46.000000000 +0200 @@ -1,12 +1,16 @@ /* * conn.c - * $Id: conn.c,v 1.40 2005/07/05 19:14:38 ianmacd Exp $ + * $Id: conn.c,v 1.49 2006/04/20 16:39:46 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif /* RDoc needs the following bogus code to find the parent module: * @@ -68,6 +72,7 @@ LDAP *cldap; char *chost; int cport; + int was_verbose = Qfalse; RB_LDAP_DATA *ldapdata; VALUE host, port; @@ -103,8 +108,18 @@ ldapdata->ldap = cldap; rb_iv_set (self, "@args", rb_ary_new4 (argc, argv)); + + /* Silence warning that next rb_iv_get produces. */ + if (ruby_verbose == Qtrue) + { + was_verbose = Qtrue; + ruby_verbose = Qfalse; + } + if (rb_iv_get (self, "@sasl_quiet") != Qtrue) rb_iv_set (self, "@sasl_quiet", Qfalse); + if (was_verbose == Qtrue) + ruby_verbose = Qtrue; return Qnil; }; @@ -219,7 +234,7 @@ char *dn = NULL; char *passwd = NULL; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -310,7 +325,7 @@ char *passwd = NULL; int method = LDAP_AUTH_SIMPLE; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -395,7 +410,7 @@ { RB_LDAP_DATA *ldapdata; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); return ldapdata->bind == 0 ? Qfalse : Qtrue; }; @@ -868,7 +883,7 @@ } if (!(cmsg && (*cmsg))) { - rb_raise (rb_eRuntimeError, "no message"); + rb_raise (rb_eRuntimeError, "no result returned by search"); } Check_LDAP_Result ((*ldapdata)->err); @@ -903,6 +918,31 @@ } static VALUE +rb_ldap_conn_search2_b (VALUE rdata) +{ + void **data = (void *) rdata; + LDAP *cldap = (LDAP *) data[0]; + LDAPMessage *cmsg = (LDAPMessage *) data[1]; + VALUE ary = (VALUE) data[2]; + LDAPMessage *e; + VALUE m; + VALUE hash; + + for (e = ldap_first_entry (cldap, cmsg); e != NULL; + e = ldap_next_entry (cldap, e)) + { + m = rb_ldap_entry_new (cldap, e); + hash = rb_ldap_entry_to_hash (m); + rb_ary_push (ary, hash); + if (rb_block_given_p ()) + { + rb_ensure (rb_yield, hash, rb_ldap_conn_invalidate_entry, m); + } + } + return Qnil; +} + +static VALUE rb_ldap_msgfree (VALUE data) { LDAPMessage *cmsg = (LDAPMessage *) data; @@ -970,6 +1010,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_s (int argc, VALUE argv[], VALUE self) @@ -982,7 +1028,8 @@ rb_ldap_conn_search_i (argc, argv, self, &ldapdata, &cmsg); cldap = ldapdata->ldap; - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg }; @@ -997,31 +1044,6 @@ return self; } -static VALUE -rb_ldap_conn_search2_b (VALUE rdata) -{ - void **data = (void *) rdata; - LDAP *cldap = (LDAP *) data[0]; - LDAPMessage *cmsg = (LDAPMessage *) data[1]; - VALUE ary = (VALUE) data[2]; - LDAPMessage *e; - VALUE m; - VALUE hash; - - for (e = ldap_first_entry (cldap, cmsg); e != NULL; - e = ldap_next_entry (cldap, e)) - { - m = rb_ldap_entry_new (cldap, e); - hash = rb_ldap_entry_to_hash (m); - rb_ary_push (ary, hash); - if (rb_block_given_p ()) - { - rb_ensure (rb_yield, hash, rb_ldap_conn_invalidate_entry, m); - } - } - return Qnil; -} - /* * call-seq: * conn.search2(base_dn, scope, filter, attrs=nil, attrsonly=false, @@ -1045,6 +1067,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search2_s (int argc, VALUE argv[], VALUE self) @@ -1059,7 +1087,8 @@ cldap = ldapdata->ldap; ary = rb_ary_new (); - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg, (void *) ary }; @@ -1228,6 +1257,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_ext_s (int argc, VALUE argv[], VALUE self) @@ -1239,7 +1274,8 @@ rb_ldap_conn_search_ext_i (argc, argv, self, &ldapdata, &cmsg); cldap = ldapdata->ldap; - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg }; rb_ensure (rb_ldap_conn_search_b, (VALUE) pass_data, @@ -1277,6 +1313,12 @@ * If +s_attr+ is given, it specifies the attribute on which to sort the * entries returned by the server. If +s_proc+ is given, it specifies a Proc * object that will be used to sort the entries returned by the server. + * + * Note that not all results may be returned by this method. If a + * size limit has been set for the number of results to be returned and this + * limit is exceeded, the results set will be truncated. You can check for + * this by calling LDAP::Conn#err immediately after this method and comparing + * the result to LDAP::LDAP_SIZELIMIT_EXCEEDED. */ VALUE rb_ldap_conn_search_ext2_s (int argc, VALUE argv[], VALUE self) @@ -1290,7 +1332,8 @@ cldap = ldapdata->ldap; ary = rb_ary_new (); - if (ldapdata->err == LDAP_SUCCESS) + if (ldapdata->err == LDAP_SUCCESS + || ldapdata->err == LDAP_SIZELIMIT_EXCEEDED) { void *pass_data[] = { (void *) cldap, (void *) cmsg, (void *) ary }; rb_ensure (rb_ldap_conn_search2_b, (VALUE) pass_data, @@ -1647,19 +1690,28 @@ { RB_LDAP_DATA *ldapdata; char *c_dn, *c_attr; +#ifdef USE_WLDAP32 + char *c_val; +#endif struct berval bval; LDAPControl **sctrls, **cctrls; GET_LDAP_DATA (self, ldapdata); c_dn = StringValueCStr (dn); c_attr = StringValueCStr (attr); +#ifdef USE_WLDAP32 + c_val = StringValueCStr (val); +#endif bval.bv_val = StringValueCStr (val); bval.bv_len = RSTRING (val)->len; sctrls = rb_ldap_get_controls (serverctrls); cctrls = rb_ldap_get_controls (clientctrls); - ldapdata->err = ldap_compare_ext_s (ldapdata->ldap, - c_dn, c_attr, &bval, sctrls, cctrls); + ldapdata->err = ldap_compare_ext_s (ldapdata->ldap, c_dn, c_attr, +#ifdef USE_WLDAP32 + c_val, +#endif + &bval, sctrls, cctrls); if ((ldapdata->err) == LDAP_COMPARE_TRUE) return Qtrue; @@ -1675,6 +1727,12 @@ } #endif +/* + * call-seq: + * conn.err => Fixnum + * + * Return the error associated with the most recent LDAP operation. + */ VALUE rb_ldap_conn_err (VALUE self) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/example/pr_ctl new/ruby-ldap-0.9.5/example/pr_ctl --- old/ruby-ldap-0.9.2/example/pr_ctl 2005-03-09 20:07:32.000000000 +0100 +++ new/ruby-ldap-0.9.5/example/pr_ctl 2006-02-12 21:00:21.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/ruby -w # -# $Id: pr_ctl,v 1.3 2005/03/09 19:07:32 ianmacd Exp $ +# $Id: pr_ctl,v 1.4 2006/02/12 20:00:21 ianmacd Exp $ # # Program to demonstrate the use of the LDAPv3 PagedResults control. This # control is interesting, because it requires the passing of controls in @@ -43,7 +43,7 @@ critical ) conn.set_option( LDAP::LDAP_OPT_SERVER_CONTROLS, [control] ) - this_page = conn.search2( 'dc=localhost,dc=localdomain', + this_page = conn.search2( 'dc=google, dc=com', LDAP::LDAP_SCOPE_SUBTREE, '(objectclass=*)', ['cn'] ) @@ -57,12 +57,12 @@ # How many entries does the server estimate are left? # Also, get the cookie returned by the last search. returned_size, cookie = control.decode - puts "Returned size = #{returned_size}" if $DEBUG + puts "Returned size = #{returned_size.to_i}" if $DEBUG # According to RFC 2696, the server may not be able to estimate the number # of results outstanding. In that case, it will return zero, so we should # only use the new size if it is non-zero. - page_size = returned_size if returned_size > 0 + page_size = returned_size.to_i if returned_size.to_i > 0 puts "Returned cookie = #{cookie.inspect}" if $DEBUG diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/extconf.rb new/ruby-ldap-0.9.5/extconf.rb --- old/ruby-ldap-0.9.2/extconf.rb 2005-02-23 06:30:49.000000000 +0100 +++ new/ruby-ldap-0.9.5/extconf.rb 2006-04-19 01:49:56.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env ruby-1.4 # # extconf.rb for ldap extension -# $Id: extconf.rb,v 1.4 2005/02/23 05:30:49 ianmacd Exp $ +# $Id: extconf.rb,v 1.7 2006/04/18 23:49:56 ianmacd Exp $ # require 'mkmf' @@ -10,15 +10,15 @@ if( ARGV.include?("--help") ) print <<EOF - --with-ldap-dir specify the ldap directory. - --with-ldap-incdir specify the directory which contains ldap.h and lber.h. - --with-ldap-libdir specify the directory which contains ldap libraries. - --with-netscape use this option, if you use Netscape SDK. - --with-openldap1 use this option, if you use OpenLDAP-1.x. - --with-openldap2 use this option, if you use OpenLDAP-2.x. - --with-wldap32 use this option, if you use Active Directory Client API. + --with-ldap-dir specify the LDAP directory. + --with-ldap-include specify the directory containing ldap.h and lber.h. + --with-ldap-lib specify the directory containing the LDAP libraries. + --with-netscape build with Netscape SDK. + --with-openldap1 build with OpenLDAP 1.x. + --with-openldap2 build with OpenLDAP 2.x. + --with-wldap32 Active Directory Client API. -The follows are library configuration options: +The following are library configuration options: --with-libcrypto=crypto, --without-libcrypto --with-libssl=ssl, --without-libssl --with-libnsl=nsl, --without-libnsl @@ -82,24 +82,13 @@ end end - -if( ! $CFLAGS ) -# $CFLAGS = "-D_REENTRANT" - $CFLAGS = "" -end - -if( ! $LDFLAGS ) - $LDFLAGS = "" -end - $use_netscape = ldap_with_config("netscape") $use_openldap1 = ldap_with_config("openldap1") $use_openldap2 = ldap_with_config("openldap2") $use_wldap32 = ldap_with_config("wldap32") +dir_config('ldap') $ldap_dir = ldap_with_config("ldap-dir") || ldap_with_config("ldap") -$ldap_incdir = ldap_with_config("ldap-incdir") -$ldap_libdir = ldap_with_config("ldap-libdir") $ldap_dir, $libldap, $ldap_h = find_files($ldap_dir) @@ -123,14 +112,14 @@ if( $use_netscape ) case $use_netscape when /^4/ - $CFLAGS += " -DUSE_NETSCAPE_SDK" + $defs << "-DUSE_NETSCAPE_SDK" #$libnsl = ldap_with_config("libnsl", "nsl") #$libpthread = ldap_with_config("libpthread", "pthread") $libresolv = ldap_with_config("libresolv", "resolv") $libldap = ldap_with_config("libldap", $libldap) $libns = ldap_with_config("libns", "nspr3,plc3,plds3").split(",") when /^5/ - $CFLAGS += " -DUSE_NETSCAPE_SDK" + $defs << "-DUSE_NETSCAPE_SDK" #$libnsl = ldap_with_config("libnsl", "nsl") #$libpthread = ldap_with_config("libpthread", "pthread") $libresolv = ldap_with_config("libresolv", "resolv") @@ -142,14 +131,19 @@ end if( $use_openldap1 ) - $CFLAGS += " -DUSE_OPENLDAP1 -DUSE_OPENLDAP" + $defs << "-DUSE_OPENLDAP1" + $defs << "-DUSE_OPENLDAP" $libresolv = ldap_with_config("libresolv", "resolv") $libldap = ldap_with_config("libldap", "ldap") $liblber = ldap_with_config("liblber", "lber") end if( $use_openldap2 ) - $CFLAGS += " -DUSE_OPENLDAP2 -DUSE_OPENLDAP" + $defs << "-DUSE_OPENLDAP2" + $defs << "-DUSE_OPENLDAP" + # OpenLDAP 2.3 finally deprecates a bunch of non-_ext functions. We need + # this to enable them. + $defs << "-DLDAP_DEPRECATED" $libresolv = ldap_with_config("libresolv", "resolv") $libcrypto = ldap_with_config("libcrypto", "crypto") $libssl = ldap_with_config("libssl", "ssl") @@ -165,27 +159,14 @@ if( !File.exist?("win") ) Dir.mkdir("win") end - `dlltool --dllname wldap32.dll --input-def #{srcdir}/win/wldap32.def --output-lib win/wldap32.lib` - $CFLAGS += " -DUSE_WLDAP32 -I#{srcdir}/win" - $LDFLAGS += " -L./win" + `lib /def:#{srcdir}/win/wldap32.def /out:#{srcdir}/win/wldap32.lib` + $defs << "-DUSE_WLDAP32" + dir_config("wldap32", "#{srcdir}/win", "./win") $libldap = ldap_with_config("libldap", "wldap32") end -if( $ldap_dir ) - $CFLAGS += " -I" + File.join($ldap_dir,"include") - $LDFLAGS += " -L" + File.join($ldap_dir,"lib") -end - -if( $ldap_incdir ) - $CFLAGS += " -I" + $ldap_incdir -end - -if( $ldap_libdir ) - $LDFLAGS += " -L" + $ldap_libdir -end - if( $libpthread ) - $CFLAGS += " -D_REENTRANT" + $defs << "-D_REENTRANT" end if( $use_wldap32 ) @@ -233,9 +214,6 @@ have_func("ldap_unbind_ext_s") have_func("ldap_sasl_interactive_bind_s") -print("CFLAGS = #{$CFLAGS}\n") -print("LDFLAGS = #{$LDFLAGS}\n") - create_makefile("ldap") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/install.rb new/ruby-ldap-0.9.5/install.rb --- old/ruby-ldap-0.9.2/install.rb 2003-01-14 10:14:30.000000000 +0100 +++ new/ruby-ldap-0.9.5/install.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -require 'mkmf' -require 'ftools' - -SO_LIBS = ["ldap.so"] - -$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR'] -$prefix = CONFIG['prefix'] -$libdir = File.join($prefix,'lib') -$rubylibdir = File.join($libdir, 'ruby', $ruby_version) -$arch = CONFIG['arch'] -$archdir = File.join($rubylibdir, $arch) - -def find(dir, match = /./) - Dir.chdir(dir) - files = [] - Dir.new(".").each{|file| - if( file != "." && file != ".." ) - case File.ftype(file) - when "file" - if( file =~ match ) - files.push(File.join(dir,file)) - end - when "directory" - files += find(file, match).collect{|f| File.join(dir,f)} - end - end - } - Dir.chdir("..") - return files -end - -def install() - rb_files = find(File.join(".","lib"), /.rb$/) - - SO_LIBS.each{|f| - File.makedirs($rubylibdir, "#{$archdir}") - File.install(f, File.join($archdir,f), 0555, true) - } - - rb_files.each{|f| - origfile = f - instfile = File.join($rubylibdir, origfile.sub(%r{./lib/},"")) - instdir = File.dirname(instfile) - File.makedirs(instdir) - File.install(origfile, instfile, 0644, true) - } -end - -install() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/lib/ldap/schema.rb new/ruby-ldap-0.9.5/lib/ldap/schema.rb --- old/ruby-ldap-0.9.2/lib/ldap/schema.rb 2005-03-15 11:37:03.000000000 +0100 +++ new/ruby-ldap-0.9.5/lib/ldap/schema.rb 2006-02-09 00:15:17.000000000 +0100 @@ -1,7 +1,7 @@ # Manipulation of LDAP schema data. # #-- -# $Id: schema.rb,v 1.7 2005/03/15 10:37:03 ianmacd Exp $ +# $Id: schema.rb,v 1.9 2006/02/08 23:15:17 ianmacd Exp $ #++ # The LDAP module encapsulates the various LDAP-related classes in their own @@ -25,7 +25,7 @@ # +key+. See LDAP::Conn#schema for common values of +key+. # def names(key) - self[key].collect{|val| val =~ /NAME\s+'([\w\d]+)'/; $1} + self[key].collect{|val| val =~ /NAME\s+'([\w\d_-]+)'/; $1} end # Return the list of attributes in object class +oc+ that are of category @@ -35,9 +35,9 @@ self['objectClasses'].each{|s| if( s =~ /NAME\s+'#{oc}'/ ) case s - when /#{at}\s+$([\w\d\s\$]+)$/i + when /#{at}\s+$([\w\d_-\s\$]+)$/i return $1.split("$").collect{|attr| attr.strip} - when /#{at}\s+([\w\d]+)/i + when /#{at}\s+([\w\d_-]+)/i return $1.split("$").collect{|attr| attr.strip} end end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/rbldap.h new/ruby-ldap-0.9.5/rbldap.h --- old/ruby-ldap-0.9.2/rbldap.h 2005-07-07 01:41:52.000000000 +0200 +++ new/ruby-ldap-0.9.5/rbldap.h 2006-04-20 18:47:00.000000000 +0200 @@ -1,6 +1,6 @@ /* * rbldap.h - * $Id: rbldap.h,v 1.11 2005/07/06 23:41:52 ianmacd Exp $ + * $Id: rbldap.h,v 1.15 2006/04/20 16:47:00 ianmacd Exp $ */ #ifndef RB_LDAP_H @@ -29,8 +29,8 @@ #define RB_LDAP_MAJOR_VERSION 0 #define RB_LDAP_MINOR_VERSION 9 -#define RB_LDAP_PATCH_VERSION 2 -#define RB_LDAP_VERSION "0.9.2" +#define RB_LDAP_PATCH_VERSION 5 +#define RB_LDAP_VERSION "0.9.5" #define LDAP_GET_OPT_MAX_BUFFER_SIZE (1024) /* >= sizeof(LDAPAPIInfo) */ @@ -142,7 +142,7 @@ }; #define Check_LDAP_Result(err) { \ - if( err != LDAP_SUCCESS ){ \ + if( err != LDAP_SUCCESS && err != LDAP_SIZELIMIT_EXCEEDED ){ \ rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \ } \ } Binary files old/ruby-ldap-0.9.2/ruby-ldap-0.9.2.tar.gz and new/ruby-ldap-0.9.5/ruby-ldap-0.9.2.tar.gz differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/ruby-ldap.spec new/ruby-ldap-0.9.5/ruby-ldap.spec --- old/ruby-ldap-0.9.2/ruby-ldap.spec 2005-07-07 01:55:03.000000000 +0200 +++ new/ruby-ldap-0.9.5/ruby-ldap.spec 2006-04-20 18:50:50.000000000 +0200 @@ -1,11 +1,11 @@ -# $Id: ruby-ldap.spec,v 1.6 2005/07/06 23:55:03 ianmacd Exp $ +# $Id: ruby-ldap.spec,v 1.11 2006/04/20 16:50:50 ianmacd Exp $ %define openldap %( rpm -q --qf '%%{version}' openldap | ruby -e 'puts gets.sub(/\\d+$/,"0")' ) # Build documentation if we have rdoc on the build system. %define rdoc %( type rdoc > /dev/null && echo 1 || echo 0 ) Summary: LDAP API (RFC1823) library module for Ruby. Name: ruby-ldap -Version: 0.9.2 +Version: 0.9.5 Release: 1 License: Redistributable Group: Applications/Ruby @@ -37,14 +37,15 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %if %{rdoc} -rdocpath=`ruby -rrdoc/ri/ri_paths -e 'puts RI::Paths::PATH[1]'` -rdoc -r -o $RPM_BUILD_ROOT$rdocpath -x CVS *.c lib -rm $RPM_BUILD_ROOT$rdocpath/created.rid + rdocpath=`ruby -rrdoc/ri/ri_paths -e 'puts RI::Paths::PATH[1] || + RI::Paths::PATH[0]'` + rdoc -r -o $RPM_BUILD_ROOT$rdocpath -x CVS *.c lib + rm $RPM_BUILD_ROOT$rdocpath/created.rid %endif find $RPM_BUILD_ROOT -type f -print | \ ruby -pe 'sub(%r(^'$RPM_BUILD_ROOT'), "")' > %{name}-%{version}-filelist %if %{rdoc} -echo '%%docdir' $rdocpath >> %{name}-%{version}-filelist + echo '%%docdir' $rdocpath >> %{name}-%{version}-filelist %endif %files -f %{name}-%{version}-filelist @@ -53,12 +54,43 @@ %doc example/ test/ %changelog +* Thu Apr 20 2006 Ian Macdonald <ian(a)caliban.org> 0.9.5-1 +- 0.9.5 +- The software now builds and works out of the box on Windows. + +* Wed Mar 8 2006 Ian Macdonald <ian(a)caliban.org> 0.9.4-1 +- 0.9.4 +- Modify LDAP::Conn#search, LDAP::Conn#search2, LDAP::Conn#search_ext and + LDAP::Conn#search_ext2 to treat LDAP_SIZELIMIT_EXCEEDED as success. After + using any of these four methods, the user should check whether + LDAP::Conn#err == LDAP::LDAP_SIZELIMIT_EXCEEDED. If true, the results set + has been truncated by the server. Previously, LDAP_SIZELIMIT_EXCEEDED would + raise an exception and no results would be returned, which is not the + correct behaviour if the user has deliberately put a limit on the number of + results to be returned, in order to spare the server. +- Duplicate code refactored. +- Missing RDoc documentation added for LDAP::Conn#err. + +* Sat Feb 18 2006 Ian Macdonald <ian(a)caliban.org> 0.9.3-1 +- 0.9.3 +- LDAP::Schema#names and LDAP::Schema#attr will now allow names with hyphens + and/or underscores. +- Silence a warning about @sasl_quiet when run in debug mode. +- Fix uninitialised data structures in LDAP::SSLConn#bind and + LDAP::SSLConn#simple_bind. +- Build properly with OpenLDAP 2.3. +- Build-time options --with-ldap-incdir and --with-ldap-libdir have been + replaced by --with-ldap-include and --with-ldap-lib. This is a consequence of + making extconf.rb more standard. +- Windows build has been improved, so that it should now at least build without + error. Whether it will work is another matter. + * Wed Jul 6 2005 Ian Macdonald <ian(a)caliban.org> 0.9.2-1 - 0.9.2 - Minor build problem fixed for certain architectures. - For Conn#search, Conn#search2, Conn#search_ext and Conn#search_ext2, - allow attrs to be a string, in which case the parameter is treated as a - single-element array. + allow attrs to be a string, in which case it is treated as a single-element + array. * Tue Mar 15 2005 Ian Macdonald <ian(a)caliban.org> 0.9.1-1 - 0.9.1 @@ -78,11 +110,11 @@ already so. This is required for a SASL bind. - LDAP::Conn#sasl_bind did not detect attempts to bind more than once. This is now done. -- SSLConn#open now returns a NotImplementedError exception. Previously, it +- SSLConn#open now throws a NotImplementedError exception. Previously, it would call the same method in the superclass, which would not work. - Unused variables removed to silence gcc warnings. - More unit tests and documentation fixes. -- strip ldap.so. +- ldap.so is now stripped. * Wed Mar 2 2005 Ian Macdonald <ian(a)caliban.org> 0.9.0-1 - 0.9.0 @@ -136,13 +168,13 @@ - Patch incorrect library version. * Sun Dec 14 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-4 -- further refine saslconn.c patch +- Further refine saslconn.c patch * Thu Dec 11 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-3 -- further refine saslconn.c patch +- Further refine saslconn.c patch * Thu Dec 11 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-2 -- patch saslconn.c to allow GSSAPI via SASL +- Patch saslconn.c to allow GSSAPI via SASL * Sun Dec 7 2003 Ian Macdonald <ian(a)caliban.org> 0.8.2-1 - 0.8.2 @@ -160,16 +192,16 @@ - 0.7.1 * Tue Jul 2 2002 Ian Macdonald <ian(a)caliban.org> -- add BuildRequires for openssl-devel and openldap-devel +- Add BuildRequires for openssl-devel and openldap-devel * Sun Jun 2 2002 Ian Macdonald <ian(a)caliban.org> - 0.7.0 * Mon Apr 29 2002 Ian Macdonald <ian(a)caliban.org> -- simplified install section +- Simplified install section * Fri Apr 5 2002 Ian Macdonald <ian(a)caliban.org> -- added test directory to docs +- Added test directory to docs * Tue Apr 2 2002 Ian Macdonald <ian(a)caliban.org> - 0.6.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/saslconn.c new/ruby-ldap-0.9.5/saslconn.c --- old/ruby-ldap-0.9.2/saslconn.c 2005-07-07 01:53:36.000000000 +0200 +++ new/ruby-ldap-0.9.5/saslconn.c 2006-02-13 18:20:32.000000000 +0100 @@ -1,12 +1,16 @@ /* * saslconn.c - * $Id: saslconn.c,v 1.22 2005/07/06 23:53:36 ianmacd Exp $ + * $Id: saslconn.c,v 1.25 2006/02/13 17:20:32 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif extern VALUE rb_ldap_conn_initialize (int argc, VALUE argv[], VALUE self); extern VALUE rb_ldap_conn_rebind (VALUE self); @@ -25,7 +29,12 @@ * conn.sasl_bind(dn=nil, mech=nil, cred=nil, sctrls=nil, cctrls=nil) * { |conn| } => nil * - * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, + * Bind an LDAP connection, using the DN, +dn+, the mechanism, +mech+, and the + * credential, +cred+. + * + * +sctrls+ is an array of server controls, whilst +cctrls+ is an array of + * client controls. + * * and the bind method, +method+. If a block is given, +self+ is yielded to * the block. */ @@ -53,7 +62,7 @@ unsigned sasl_flags = LDAP_SASL_AUTOMATIC; - Data_Get_Struct (self, struct rb_ldap_data, ldapdata); + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/sslconn.c new/ruby-ldap-0.9.5/sslconn.c --- old/ruby-ldap-0.9.2/sslconn.c 2005-03-15 11:45:53.000000000 +0100 +++ new/ruby-ldap-0.9.5/sslconn.c 2006-04-20 00:13:26.000000000 +0200 @@ -1,12 +1,16 @@ /* * sslconn.c - * $Id: sslconn.c,v 1.13 2005/03/14 23:52:58 ianmacd Exp $ + * $Id: sslconn.c,v 1.18 2006/04/19 22:13:26 ianmacd Exp $ */ #include "ruby.h" #include "rbldap.h" -#include <sys/time.h> -#include <unistd.h> +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif +#if defined(HAVE_UNISTD_H) +# include <unistd.h> +#endif #if defined(HAVE_LDAP_START_TLS_S) # define USE_OPENLDAP_SSLCONN @@ -252,21 +256,14 @@ return Qnil; } -/* - * call-seq: - * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) => self - * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) - * { |conn| } => self - * - * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, - * and the bind method, +method+. If a block is given, +self+ is yielded to - * the block. - */ VALUE -rb_ldap_sslconn_bind_s (int argc, VALUE argv[], VALUE self) +rb_ldap_sslconn_bind_f (int argc, VALUE argv[], VALUE self, + VALUE (*rb_ldap_sslconn_bind_func) (int, VALUE[], + VALUE)) { RB_LDAP_DATA *ldapdata; + Data_Get_Struct (self, RB_LDAP_DATA, ldapdata); if (!ldapdata->ldap) { if (rb_iv_get (self, "@args") != Qnil) @@ -284,7 +281,23 @@ ldapdata->err = ldap_connect (ldapdata->ldap, NULL); Check_LDAP_Result (ldapdata->err); - return rb_ldap_conn_bind_s (argc, argv, self); + return rb_ldap_sslconn_bind_func (argc, argv, self); +} + +/* + * call-seq: + * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) => self + * conn.bind(dn=nil, password=nil, method=LDAP::LDAP_AUTH_SIMPLE) + * { |conn| } => self + * + * Bind an LDAP connection, using the DN, +dn+, the credential, +password+, + * and the bind method, +method+. If a block is given, +self+ is yielded to + * the block. + */ +VALUE +rb_ldap_sslconn_bind_s (int argc, VALUE argv[], VALUE self) +{ + return rb_ldap_sslconn_bind_f (argc, argv, self, rb_ldap_conn_bind_s); } /* @@ -298,26 +311,8 @@ VALUE rb_ldap_sslconn_simple_bind_s (int argc, VALUE argv[], VALUE self) { - RB_LDAP_DATA *ldapdata; - - if (!ldapdata->ldap) - { - if (rb_iv_get (self, "@args") != Qnil) - { - rb_ldap_conn_rebind (self); - GET_LDAP_DATA (self, ldapdata); - } - else - { - rb_raise (rb_eLDAP_InvalidDataError, - "The LDAP handler has already unbound."); - } - } - - ldapdata->err = ldap_connect (ldapdata->ldap, NULL); - Check_LDAP_Result (ldapdata->err); - - return rb_ldap_conn_simple_bind_s (argc, argv, self); + return rb_ldap_sslconn_bind_f (argc, argv, self, + rb_ldap_conn_simple_bind_s); } #endif /* USE_WLDAP32_SSLCONN */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/test/tc_search.rb new/ruby-ldap-0.9.5/test/tc_search.rb --- old/ruby-ldap-0.9.2/test/tc_search.rb 2005-03-23 11:01:09.000000000 +0100 +++ new/ruby-ldap-0.9.5/test/tc_search.rb 2006-02-12 20:55:59.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: tc_search.rb,v 1.3 2005/03/23 10:01:09 ianmacd Exp $ +# $Id: tc_search.rb,v 1.4 2006/02/12 19:55:59 ianmacd Exp $ # # A suite of unit tests for testing Ruby/LDAP search functionality. @@ -92,6 +92,7 @@ true ) @@conn.set_option( LDAP::LDAP_OPT_SERVER_CONTROLS, [ ctrl ] ) + this_page = nil assert_nothing_raised do begin this_page = @@conn.search2( @@naming_context, @@ -115,7 +116,7 @@ assert_equal( ctrl.oid, LDAP::LDAP_CONTROL_PAGEDRESULTS ) fetched_size, cookie = ctrl.decode - page_size = fetched_size if fetched_size > 0 + page_size = fetched_size if fetched_size.to_i > 0 break if cookie.empty? end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/win/winldap.h new/ruby-ldap-0.9.5/win/winldap.h --- old/ruby-ldap-0.9.2/win/winldap.h 2002-11-18 09:22:31.000000000 +0100 +++ new/ruby-ldap-0.9.5/win/winldap.h 2006-04-20 18:34:21.000000000 +0200 @@ -1,7 +1,9 @@ -/* -*- C -*- - * $Id: winldap.h,v 1.3 2002/11/18 08:22:31 ttate Exp $ +/* + * $Id: winldap.h,v 1.5 2006/04/20 16:34:21 ianmacd Exp $ + * * Copyright (C) 2001 Takaaki Tateishi <ttate(a)kt.jaist.ac.jp> - * References: MSDN Library, OpenLDAP, Cygwin + * Copyright (C) 2006 Ian Macdonald <ian(a)caliban.org> + * */ #ifndef WINLDAP_H @@ -183,9 +185,7 @@ */ -struct ldap { - /* We don't know how the structure is defined. */ -}; +struct ldap; typedef struct ldap LDAP, *PLDAP; typedef struct ldapcontrol { @@ -194,9 +194,7 @@ BOOLEAN ldctl_iscritical; } LDAPControl, *PLDAPControl; -struct ldapmsg { - /* We don't know how the structure is defined. */ -}; +struct ldapmsg; typedef struct ldapmsg LDAPMessage, *PLDAPMessage; @@ -225,18 +223,11 @@ } LDAP_REFERRAL_CALLBACK, *PLDAP_REFERRAL_CALLBACK; */ -struct ldapsearch { - /* We don't know how the structure is defined. */ -}; +struct ldapsearch; typedef struct ldapsearch LDAPSearch, *PLDAPSearch; #if defined(HAVE_SYS_TIME_H) # include <sys/time.h> -#else -struct timeval { - long tv_sec; - long tv_usec; -}; #endif typedef struct timeval LDAP_TIMEVAL; typedef struct timeval *PLDAP_TIMEVAL; @@ -281,7 +272,8 @@ LDAPControl **sctls, LDAPControl **cctls); ULONG ldap_compare_s(LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value); ULONG ldap_compare_ext_s(LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - LDAPControl **sctls, LDAPControl **cctls); + struct berval *data, LDAPControl **sctls, + LDAPControl **cctls); ULONG ldap_count_entries(LDAP *ld, LDAPMessage *res); ULONG ldap_count_values(PCHAR *vals); ULONG ldap_delete_s(LDAP *ld, PCHAR dn); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ruby-ldap-0.9.2/win/wldap32.def new/ruby-ldap-0.9.5/win/wldap32.def --- old/ruby-ldap-0.9.2/win/wldap32.def 2002-11-06 08:56:34.000000000 +0100 +++ new/ruby-ldap-0.9.5/win/wldap32.def 2006-04-19 21:33:00.000000000 +0200 @@ -1,39 +1,32 @@ -; -; wldap32.def +; wldap32.def ; -; Exports for WLDAP32 DLL +; $Id: wldap32.def,v 1.3 2006/04/19 19:33:00 ianmacd Exp $ ; -; Copyright (C) 1998 Free Software Foundation, Inc. -; Created by J.J. van der Heijden <J.J.vanderHeijden(a)student.utwente.nl> -; -; This file is part of the Windows32 API Library. -; Based on the November 1997 Platform SDK +; Exports for WLDAP32 DLL ; -; This library is free software; you can redistribute it and/or -; modify it under the terms of the GNU Library General Public -; License as published by the Free Software Foundation; either -; version 2 of the License, or (at your option) any later version. -; -; This library is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -; Library General Public License for more details. -; -; You should have received a copy of the GNU Library General Public -; License along with this library; see the file COPYING.LIB. -; If not, write to the Free Software Foundation, -; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +; Created by Chris Scharf <scharfie(a)gmail.com> using instructions from: ; +; http://support.microsoft.com/kb/q131313/ + LIBRARY WLDAP32 EXPORTS -; ?ldap_get_optionW@@YAKPAUldap@@HPAX@Z -; ?ldap_set_optionW@@YAKPAUldap@@HPAX@Z -LdapDllInit@12 LdapGetLastError LdapMapErrorToWin32 LdapUTF8ToUnicode LdapUnicodeToUTF8 +ber_alloc_t +ber_bvdup +ber_bvecfree ber_bvfree +ber_first_element +ber_flatten +ber_free +ber_init +ber_next_element +ber_peek_tag +ber_printf +ber_scanf +ber_skip_tag cldap_open cldap_openA cldap_openW @@ -56,6 +49,8 @@ ldap_bind_s ldap_bind_sA ldap_bind_sW +ldap_check_filterA +ldap_check_filterW ldap_cleanup ldap_close_extended_op ldap_compare @@ -70,6 +65,7 @@ ldap_compare_s ldap_compare_sA ldap_compare_sW +ldap_conn_from_msg ldap_connect ldap_control_free ldap_control_freeA @@ -89,6 +85,8 @@ ldap_create_sort_control ldap_create_sort_controlA ldap_create_sort_controlW +ldap_create_vlv_controlA +ldap_create_vlv_controlW ldap_delete ldap_deleteA ldap_deleteW @@ -102,6 +100,7 @@ ldap_delete_sA ldap_delete_sW ldap_dn2ufn +ldap_dn2ufnA ldap_dn2ufnW ldap_encode_sort_controlA ldap_encode_sort_controlW @@ -117,6 +116,8 @@ ldap_extended_operation ldap_extended_operationA ldap_extended_operationW +ldap_extended_operation_sA +ldap_extended_operation_sW ldap_first_attribute ldap_first_attributeA ldap_first_attributeW @@ -132,6 +133,7 @@ ldap_get_next_page_s ldap_get_option ldap_get_optionA +ldap_get_optionW ldap_get_paged_count ldap_get_values ldap_get_valuesA @@ -178,6 +180,8 @@ ldap_open ldap_openA ldap_openW +ldap_parse_extended_resultA +ldap_parse_extended_resultW ldap_parse_page_control ldap_parse_page_controlA ldap_parse_page_controlW @@ -190,6 +194,8 @@ ldap_parse_sort_control ldap_parse_sort_controlA ldap_parse_sort_controlW +ldap_parse_vlv_controlA +ldap_parse_vlv_controlW ldap_perror ldap_rename_ext ldap_rename_extA @@ -199,6 +205,10 @@ ldap_rename_ext_sW ldap_result ldap_result2error +ldap_sasl_bindA +ldap_sasl_bindW +ldap_sasl_bind_sA +ldap_sasl_bind_sW ldap_search ldap_searchA ldap_searchW @@ -222,6 +232,7 @@ ldap_set_dbg_routine ldap_set_option ldap_set_optionA +ldap_set_optionW ldap_simple_bind ldap_simple_bindA ldap_simple_bindW @@ -231,7 +242,10 @@ ldap_sslinit ldap_sslinitA ldap_sslinitW +ldap_start_tls_sA +ldap_start_tls_sW ldap_startup +ldap_stop_tls_s ldap_ufn2dn ldap_ufn2dnA ldap_ufn2dnW ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rsaref
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package rsaref checked in at Thu May 25 00:52:54 CEST 2006. -------- --- rsaref/rsaref.changes 2006-03-27 18:33:21.000000000 +0200 +++ rsaref/rsaref.changes 2006-05-24 22:10:07.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:09:59 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsaref.spec ++++++ --- /var/tmp/diff_new_pack.iM2Xym/_old 2006-05-25 00:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.iM2Xym/_new 2006-05-25 00:52:44.000000000 +0200 @@ -15,7 +15,7 @@ Provides: rsaref Autoreqprov: on Version: 2.0 -Release: 515 +Release: 521 Summary: RSA Reference Implementation Source: rsaref-2.0.tar.gz Patch0: rsaref-optflags.patch @@ -53,7 +53,6 @@ pushd local make XCFLAGS="%{optflags}" mv rsaref.a ../librsaref.a - strip librsaref.so mv librsaref.so ../ popd @@ -87,6 +86,8 @@ %{_bindir}/rdemo %changelog -n rsaref +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Mon Mar 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Mar 27 2006 - pth(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit routed
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package routed checked in at Thu May 25 00:52:41 CEST 2006. -------- --- routed/routed.changes 2006-01-25 21:41:12.000000000 +0100 +++ routed/routed.changes 2006-05-24 22:08:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 22:08:24 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- netkit-routed-0.17-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ routed.spec ++++++ --- /var/tmp/diff_new_pack.zyAmOi/_old 2006-05-25 00:52:37.000000000 +0200 +++ /var/tmp/diff_new_pack.zyAmOi/_new 2006-05-25 00:52:37.000000000 +0200 @@ -1,15 +1,14 @@ # # spec file for package routed (Version 0.17) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libselinux libstdc++ libxcrypt m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt ps pwdutils rcs readline sed sendmail strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel autoconf automake binutils gcc gdbm gettext libtool perl rpm Name: routed #!BuildIgnore: nkita nkitb nkitserv @@ -19,7 +18,7 @@ PreReq: %insserv_prereq %fillup_prereq Autoreqprov: on Version: 0.17 -Release: 469 +Release: 515 Summary: Routing Daemon which Maintains Routing Tables BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ @@ -29,6 +28,7 @@ Patch1: netkit-routed-%{version}-noroot.patch Patch2: netkit-routed-%{version}-aliasing.patch Patch3: netkit-routed-%{version}-prototypes.patch +Patch4: netkit-routed-%{version}-strip.patch %description Routed handles incoming RIP traffic and broadcasts outgoing RIP traffic @@ -44,13 +44,13 @@ %patch1 %patch2 %patch3 +%patch4 %build CFLAGS="$RPM_OPT_FLAGS" ./configure make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -d -m 755 $RPM_BUILD_ROOT/usr/sbin install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -75,6 +75,8 @@ /usr/sbin/* %changelog -n routed +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Feb 03 2004 - mjancar(a)suse.cz ++++++ netkit-routed-0.17-strip.patch ++++++ --- routed/Makefile +++ routed/Makefile @@ -10,7 +10,7 @@ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ install: all - install -s -m$(DAEMONMODE) routed $(INSTALLROOT)$(SBINDIR) + install -m$(DAEMONMODE) routed $(INSTALLROOT)$(SBINDIR) install -m$(MANMODE) routed.8 $(INSTALLROOT)$(MANDIR)/man8 clean: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qemacs
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package qemacs checked in at Thu May 25 00:52:10 CEST 2006. -------- --- qemacs/qemacs.changes 2006-01-25 21:40:58.000000000 +0100 +++ qemacs/qemacs.changes 2006-05-24 20:40:50.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 24 20:33:56 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- includes.patch initcall.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemacs.spec ++++++ --- /var/tmp/diff_new_pack.KT8vxX/_old 2006-05-25 00:52:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KT8vxX/_new 2006-05-25 00:52:00.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package qemacs (Version 0.3.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,12 +16,14 @@ Group: Productivity/Editors/Other Autoreqprov: on Version: 0.3.1 -Release: 202 +Release: 214 URL: http://fabrice.bellard.free.fr/qemacs/ Source0: http://fabrice.bellard.free.fr/qemacs/qemacs-0.3.1.tar.bz2 Patch0: qemacs.patch Patch1: qemacs-lib64.patch Patch2: gcc4.patch +Patch3: includes.patch +Patch4: initcall.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Quick Emacs is a very small but powerful editor @@ -66,19 +68,18 @@ %patch0 -p1 %patch1 -p1 -b .lib64 %patch2 -p1 +%patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="-g -O0" -export CXXFLAGS="-g -O0" ./configure \ --prefix=/usr \ %{_target_platform} -make +make STRIP=: %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; make -e DESTDIR=$RPM_BUILD_ROOT install chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/* @@ -94,6 +95,9 @@ %doc %{_mandir}/man1/* %changelog -n qemacs +* Wed May 24 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Nov 08 2005 - dmueller(a)suse.de ++++++ includes.patch ++++++ --- cutils.c +++ cutils.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdarg.h> #include <ctype.h> +#include <string.h> #include "cutils.h" --- libfbf.c +++ libfbf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdlib.h> +#include <string.h> #include "libfbf.h" ++++++ initcall.patch ++++++ --- qe.c +++ qe.c @@ -6174,14 +6174,14 @@ static inline void init_all_modules(void) { int (*initcall)(void); - void **ptr; + int (**ptr)(void); - ptr = (void **)&__initcall_first; + ptr = &__initcall_first; for(;;) { /* NOTE: if bound checking is on, a '\0' is inserted between each initialized 'void *' */ #if defined(__BOUNDS_CHECKING_ON) - ptr = (void **)((long)ptr + (2 * sizeof(void *))); + ptr += 2; #else ptr++; #endif --- qe.h +++ qe.h @@ -578,8 +578,8 @@ #undef __attribute__ /* same method as the linux kernel... */ -#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) -#define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) +#define __init_call __attribute__ ((used,__section__ (".initcall.init"))) +#define __exit_call __attribute__ ((used,__section__ (".exitcall.exit"))) #define qe_module_init(fn) \ static int (*__initcall_##fn)(void) __init_call = fn ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pcmciautils
by root＠suse.de 24 May '06

24 May '06

Hello community, here is the log from the commit of package pcmciautils checked in at Thu May 25 00:51:09 CEST 2006. -------- --- pcmciautils/pcmciautils.changes 2006-03-30 15:58:15.000000000 +0200 +++ pcmciautils/pcmciautils.changes 2006-05-24 23:00:56.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 24 23:00:51 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.MVwcae/_old 2006-05-25 00:51:04.000000000 +0200 +++ /var/tmp/diff_new_pack.MVwcae/_new 2006-05-25 00:51:04.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: sysfsutils URL: http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Version: 012 -Release: 7 +Release: 13 Summary: Utilities for PC-Cards License: GPL Group: Hardware/Other @@ -55,7 +55,7 @@ %setup -n pcmciautils-%{version} -T -D -a 2 %build -make all DEF_CFLAGS="$RPM_OPT_FLAGS" +make all DEF_CFLAGS="$RPM_OPT_FLAGS" STRIPCMD=true # make debugtools %install @@ -103,6 +103,8 @@ # test -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %changelog -n pcmciautils +* Wed May 24 2006 - schwab(a)suse.de +- Don't strip binaries. * Thu Mar 30 2006 - zoz(a)suse.de - added supplement modalias in specfile (Bug 161340) * Fri Jan 27 2006 - zoz(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0