Hello community,
here is the log from the commit of package libnscd
checked in at Sun Jun 4 15:26:37 CEST 2006.
--------
--- libnscd/libnscd.changes 2006-01-25 21:30:25.000000000 +0100
+++ libnscd/libnscd.changes 2006-06-03 20:59:40.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 3 20:59:22 CEST 2006 - kukuk@suse.de
+
+- Update to version 2.0 (manual page, new nscd features)
+
+-------------------------------------------------------------------
Old:
----
libnscd-1.1.tar.bz2
New:
----
libnscd-2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnscd.spec ++++++
--- /var/tmp/diff_new_pack.XzwHfD/_old 2006-06-04 15:25:32.000000000 +0200
+++ /var/tmp/diff_new_pack.XzwHfD/_new 2006-06-04 15:25:32.000000000 +0200
@@ -1,11 +1,11 @@
#
-# spec file for package libnscd (Version 1.1)
+# spec file for package libnscd (Version 2.0)
#
-# 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
@@ -14,8 +14,8 @@
License: LGPL
Group: System/Libraries
Autoreqprov: on
-Version: 1.1
-Release: 2
+Version: 2.0
+Release: 1
Summary: Library to Allow Applications to Communicate with nscd
Source: libnscd-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,13 +43,13 @@
%setup
%build
-CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=%{_prefix} --libdir=%{_libdir}
+%configure
make
make check
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/libnscd.la
mkdir -p $RPM_BUILD_ROOT/%{_lib}
mv -v $RPM_BUILD_ROOT%{_libdir}/libnscd.so.* $RPM_BUILD_ROOT/%{_lib}
ln -sf ../../%{_lib}/libnscd.so.1 $RPM_BUILD_ROOT%{_libdir}/libnscd.so
@@ -70,10 +70,12 @@
%defattr(-,root,root)
%{_prefix}/include/*.h
%{_libdir}/libnscd.a
-%{_libdir}/libnscd.la
%{_libdir}/libnscd.so
+%{_mandir}/man3/nscd_flush_cache.3*
%changelog -n libnscd
+* Sat Jun 03 2006 - kukuk@suse.de
+- Update to version 2.0 (manual page, new nscd features)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Feb 22 2005 - kukuk@suse.de
++++++ libnscd-1.1.tar.bz2 -> libnscd-2.0.tar.bz2 ++++++
++++ 18947 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/COPYING new/libnscd-2.0/COPYING
--- old/libnscd-1.1/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/libnscd-2.0/COPYING 2006-06-03 14:18:39.000000000 +0200
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/ChangeLog new/libnscd-2.0/ChangeLog
--- old/libnscd-1.1/ChangeLog 2005-02-22 13:42:23.000000000 +0100
+++ new/libnscd-2.0/ChangeLog 2006-06-03 20:55:13.000000000 +0200
@@ -1,3 +1,14 @@
+2006-06-03 Thorsten Kukuk
+
+ * release version 2.0
+
+ * src/libnscd.h: Cleanup, document interface.
+ * src/libnscd.c (nscd_open_socket): Wait for answer from nscd.
+ * src/nscd_flush_cache.3.xml: New manual page in XML format.
+ * src/nscd_flush_cache.3: Manual page generated from XML file.
+ * src/Makefile.am: Add rules for manual page.
+ * configure.in: Check for docbook style.
+
2005-02-22 Thorsten Kukuk
* release version 1.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/Makefile.am new/libnscd-2.0/Makefile.am
--- old/libnscd-1.1/Makefile.am 2004-01-06 21:44:06.000000000 +0100
+++ new/libnscd-2.0/Makefile.am 2006-06-03 17:22:12.000000000 +0200
@@ -1,10 +1,16 @@
#
-# Copyright (c) 2004 Thorsten Kukuk
+# Copyright (c) 2004, 2006 Thorsten Kukuk
#
AUTOMAKE_OPTIONS = 1.7 foreign dist-bzip2
MAINT_CHARSET = latin1
#
SUBDIRS = src
+M4_FILES = $(shell ls $(srcdir)/m4/*.m4)
+
+EXTRA_DIST = $(M4_FILES)
+
+ACLOCAL_AMFLAGS = -I m4
+
CLEANFILES = *~
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/NEWS new/libnscd-2.0/NEWS
--- old/libnscd-1.1/NEWS 2005-02-22 13:42:54.000000000 +0100
+++ new/libnscd-2.0/NEWS 2006-06-03 17:51:01.000000000 +0200
@@ -1,8 +1,13 @@
libnscd NEWS -- history of user-visible changes.
-Copyright (C) 2004, 2005 Thorsten Kukuk
+Copyright (C) 2004, 2005, 2006 Thorsten Kukuk
-Please send bug reports, questions and suggestions to .
+Please send bug reports, questions and suggestions to .
+
+Version 2.0
+* Cleanup header file
+* Add manual page
+* Wait for response from nscd and set errno according
Version 1.1
* Adjust for current nscd interface
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/config.h.in new/libnscd-2.0/config.h.in
--- old/libnscd-1.1/config.h.in 2005-02-22 14:06:32.000000000 +0100
+++ new/libnscd-2.0/config.h.in 2006-06-03 17:51:27.000000000 +0200
@@ -54,6 +54,11 @@
/* Version number of package */
#undef VERSION
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/configure.in new/libnscd-2.0/configure.in
--- old/libnscd-1.1/configure.in 2005-02-22 13:42:32.000000000 +0100
+++ new/libnscd-2.0/configure.in 2006-06-03 17:50:02.000000000 +0200
@@ -1,13 +1,13 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(libnscd, 1.1, kukuk@suse.de, libnscd)
+AC_INIT(libnscd, 2.0, kukuk@suse.de, libnscd)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/libnscd.h])
AM_CONFIG_HEADER([config.h])
AC_PREFIX_DEFAULT(/usr)
-EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Werror"
-# -Wpointer-arith
+EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Werror -Wpointer-arith"
AC_SUBST(EXTRA_CFLAGS)
+AC_GNU_SOURCE
dnl Checks for programs.
AC_PROG_CC
AM_PROG_AS
@@ -26,4 +26,20 @@
# Checks for library functions.
+dnl
+dnl Check for xsltproc
+dnl
+enable_man=yes
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+if test -z "$XSLTPROC"; then
+ enable_man=no
+fi
+AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true])
+dnl check for DocBook DTD and stylesheets in the local catalog.
+JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN],
+ [DocBook XML DTD V4.3], [], enable_man=no)
+JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+ [DocBook XSL Stylesheets], [], enable_man=no)
+AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
+
AC_OUTPUT([Makefile src/Makefile])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/m4/jh_path_xml_catalog.m4 new/libnscd-2.0/m4/jh_path_xml_catalog.m4
--- old/libnscd-1.1/m4/jh_path_xml_catalog.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/libnscd-2.0/m4/jh_path_xml_catalog.m4 2006-06-03 17:20:40.000000000 +0200
@@ -0,0 +1,54 @@
+# Checks the location of the XML Catalog
+# Usage:
+# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
+AC_DEFUN([JH_PATH_XML_CATALOG],
+[
+ # check for the presence of the XML catalog
+ AC_ARG_WITH([xml-catalog],
+ AC_HELP_STRING([--with-xml-catalog=CATALOG],
+ [path to xml catalog to use]),,
+ [with_xml_catalog=/etc/xml/catalog])
+ jh_found_xmlcatalog=true
+ XML_CATALOG_FILE="$with_xml_catalog"
+ AC_SUBST([XML_CATALOG_FILE])
+ AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+ if test -f "$XML_CATALOG_FILE"; then
+ AC_MSG_RESULT([found])
+ else
+ jh_found_xmlcatalog=false
+ AC_MSG_RESULT([not found])
+ fi
+
+ # check for the xmlcatalog program
+ AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
+ if test "x$XMLCATALOG" = xno; then
+ jh_found_xmlcatalog=false
+ fi
+
+ if $jh_found_xmlcatalog; then
+ ifelse([$1],,[:],[$1])
+ else
+ ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
+ fi
+])
+
+# Checks if a particular URI appears in the XML catalog
+# Usage:
+# JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([JH_CHECK_XML_CATALOG],
+[
+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+ if $jh_found_xmlcatalog && \
+ AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ AC_MSG_RESULT([found])
+ ifelse([$3],,,[$3
+])dnl
+ else
+ AC_MSG_RESULT([not found])
+ ifelse([$4],,
+ [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
+ [$4])
+ fi
+])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/Makefile.am new/libnscd-2.0/src/Makefile.am
--- old/libnscd-1.1/src/Makefile.am 2005-02-22 14:08:20.000000000 +0100
+++ new/libnscd-2.0/src/Makefile.am 2006-06-03 17:28:56.000000000 +0200
@@ -8,11 +8,14 @@
CLEANFILES = *~
-EXTRA_DIST = libnscd.map
+EXTRA_DIST = $(MANS) $(XMLS) libnscd.map
+
+man_MANS = nscd_flush_cache.3
+XMLS = nscd_flush_cache.3.xml
include_HEADERS = libnscd.h
-libnscd_la_LDFLAGS = -version-info 1:0:0 -Wl,--version-script=libnscd.map
+libnscd_la_LDFLAGS = -version-info 1:1:0 -Wl,--version-script=libnscd.map
lib_LTLIBRARIES = libnscd.la
@@ -20,3 +23,10 @@
EXTRA_PROGRAMS = libnscd-tester
libnscd_tester_LDADD = -L. -lnscd
+TESTS = libnscd-tester
+
+if ENABLE_REGENERATE_MAN
+%.3: %.3.xml
+ $(XMLLINT) --nonet --xinclude --postvalid --noout $<
+ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/libnscd-tester.c new/libnscd-2.0/src/libnscd-tester.c
--- old/libnscd-1.1/src/libnscd-tester.c 2004-09-16 18:48:31.000000000 +0200
+++ new/libnscd-2.0/src/libnscd-tester.c 2006-06-03 17:40:03.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Thorsten Kukuk
+/* Copyright (C) 2004, 2006 Thorsten Kukuk
Author: Thorsten Kukuk
This program is free software; you can redistribute it and/or modify
@@ -30,8 +30,8 @@
int ret;
ret = nscd_flush_cache ("passwd");
- printf ("nscd_flush_cache (\"passwd\") returned %d, %s\n",
- ret, strerror (errno));
+ printf ("nscd_flush_cache (\"passwd\") returned %d, (%d): %s\n",
+ ret, errno, strerror (errno));
ret = nscd_flush_cache ("group");
printf ("nscd_flush_cache (\"group\") returned %d, %s\n",
ret, strerror (errno));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/libnscd.c new/libnscd-2.0/src/libnscd.c
--- old/libnscd-1.1/src/libnscd.c 2005-02-22 13:54:04.000000000 +0100
+++ new/libnscd-2.0/src/libnscd.c 2006-06-03 15:17:21.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005 Thorsten Kukuk
+/* Copyright (C) 2004, 2005, 2006 Thorsten Kukuk
This file is part of the nscd interface library.
This library is free software; you can redistribute it and/or
@@ -14,6 +14,10 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
#include
#include
#include
@@ -97,6 +101,7 @@
int sock = nscd_open_socket ();
request_header req;
ssize_t nbytes;
+ int32_t resp;
struct iovec iov[2];
if (sock == -1)
@@ -111,7 +116,7 @@
iov[1].iov_base = strdup (service);
iov[1].iov_len = req.key_len;
- nbytes = writev (sock, iov, 2);
+ nbytes = TEMP_FAILURE_RETRY (writev (sock, iov, 2));
if (nbytes != (ssize_t)(iov[0].iov_len + iov[1].iov_len))
{
int err = errno;
@@ -120,6 +125,23 @@
return -1;
}
+ /* Wait for ACK. Older nscd just closed the socket, ignore that. */
+ resp = 0; /* set to 0 for old nscd implementations. */
+ nbytes = TEMP_FAILURE_RETRY (read (sock, &resp, sizeof (resp)));
+ if (nbytes != 0 && nbytes != sizeof (resp))
+ {
+ int err = errno;
+ close (sock);
+ errno = err;
+ return -1;
+ }
+
close (sock);
- return 0;
+ if (resp > 0)
+ {
+ errno = -resp;
+ return -1;
+ }
+ else
+ return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/libnscd.h new/libnscd-2.0/src/libnscd.h
--- old/libnscd-1.1/src/libnscd.h 2004-01-06 21:57:27.000000000 +0100
+++ new/libnscd-2.0/src/libnscd.h 2006-06-03 15:17:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Thorsten Kukuk
+/* Copyright (C) 2004, 2006 Thorsten Kukuk
This file is part of the nscd interface library.
This library is free software; you can redistribute it and/or
@@ -14,5 +14,26 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-int nscd_flush_cache (const char *service);
+#ifndef __LIBNSCD_H__
+#define __LIBNSCD_H__
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* nscd_flush_cache: tell nscd to flush the cache for a specified service.
+ service is passwd, group and hosts
+ return value:
+ -1: writev/readv failed or nscd reports an error, errno is set
+ 0: everything was ok
+
+ This function is thread safe.
+*/
+extern int nscd_flush_cache (const char *service);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LIBNSCD_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/nscd_flush_cache.3 new/libnscd-2.0/src/nscd_flush_cache.3
--- old/libnscd-1.1/src/nscd_flush_cache.3 1970-01-01 01:00:00.000000000 +0100
+++ new/libnscd-2.0/src/nscd_flush_cache.3 2006-06-03 17:48:37.000000000 +0200
@@ -0,0 +1,60 @@
+.\" Title: nscd_flush_cache
+.\" Author:
+.\" Generator: DocBook XSL Stylesheets v1.70.1 http://docbook.sf.net/
+.\" Date: 06/03/2006
+.\" Manual: Linux Programmer's Manual
+.\" Source: Linux Programmer's Manual
+.\"
+.TH "NSCD_FLUSH_CACHE" "3" "06/03/2006" "Linux Programmer's Manual" "Linux Programmer's Manual"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+nscd_flush_cache \- flush cache of Name Service Cache Daemon (nscd)
+.SH "SYNOPSIS"
+.sp
+.ft B
+.nf
+#include
+.fi
+.ft
+.HP 21
+.BI "int nscd_flush_cache(const\ char\ *" "service" ");"
+.SH "DESCRIPTION"
+.PP
+
+\fBnscd_flush_cache\fR() flushes the specified cache of
+\fBnscd\fR(8)
+for the given service. This is important if user or group entries are modified, so that nscd does not continue to work with old data.
+.PP
+Allowed values for
+\fIservice\fR
+are
+\fBpasswd\fR,
+\fBgroup\fR
+or
+\fBhosts\fR.
+.SH "RETURN VALUE"
+.PP
+
+\fBnscd_flush_cache\fR() returns zero on success. On error, \-1 is returned, and
+\fIerrno\fR
+is set appropriately.
+.SH "ERRORS"
+.TP 3n
+\fBENOENT\fR
+The nscd daemon is not running.
+.TP 3n
+\fBEINVAL\fR
+\fIservice\fR
+does not contain a valid value.
+.SH "NOTES"
+.PP
+Old nscd implementations don't return an error if the
+\fIservice\fR
+value is invalid.
+.SH "SEE ALSO"
+.PP
+
+\fBnscd\fR(8)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libnscd-1.1/src/nscd_flush_cache.3.xml new/libnscd-2.0/src/nscd_flush_cache.3.xml
--- old/libnscd-1.1/src/nscd_flush_cache.3.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/libnscd-2.0/src/nscd_flush_cache.3.xml 2006-06-03 17:48:31.000000000 +0200
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<refentry id='nscd_flush_cache3'>
+ <refmeta>
+ <refentrytitle>nscd_flush_cache</refentrytitle>
+ <manvolnum>3</manvolnum>
+ <refmiscinfo class='manual'>Linux Programmer's Manual</refmiscinfo>
+ </refmeta>
+
+ <refnamediv id='name'>
+ <refname>nscd_flush_cache</refname>
+ <refpurpose>flush cache of Name Service Cache Daemon (nscd)</refpurpose>
+ </refnamediv>
+
+<!-- body begins here -->
+ <refsynopsisdiv id='synopsis'>
+ <funcsynopsis>
+ <funcsynopsisinfo>#include <libnscd.h></funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>int <function>nscd_flush_cache</function></funcdef>
+ <paramdef>const char *<parameter>service</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1 id='description'>
+ <title>DESCRIPTION</title>
+ <para>
+ <function>nscd_flush_cache</function>() flushes the specified
+ cache of
+ <citerefentry>
+ <refentrytitle>nscd</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry> for the given service. This is important if
+ user or group entries are modified, so that nscd does not
+ continue to work with old data.
+ </para>
+ <para>
+ Allowed values for <varname role='parameter'>service</varname>
+ are <emphasis remap='B'>passwd</emphasis>,
+ <emphasis remap='B'>group</emphasis> or
+ <emphasis remap='B'>hosts</emphasis>.
+ </para>
+ </refsect1>
+
+ <refsect1 id='return_value'>
+ <title>RETURN VALUE</title>
+ <para>
+ <function>nscd_flush_cache</function>() returns zero on success.
+ On error, -1 is returned, and <varname>errno</varname>
+ is set appropriately.
+ </para>
+ </refsect1>
+
+ <refsect1 id='errors'>
+ <title>ERRORS</title>
+ <variablelist remap='TP'>
+ <varlistentry>
+ <term><errorcode>ENOENT</errorcode></term>
+ <listitem>
+ <para>The nscd daemon is not running.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><errorcode>EINVAL</errorcode></term>
+ <listitem>
+ <para><varname role='parameter'>service</varname>
+ does not contain a valid value.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1 id='notes'><title>NOTES</title>
+ <para>
+ Old nscd implementations don't return an error if the
+ <varname role='parameter'>service</varname> value is invalid.
+ </para>
+ </refsect1>
+
+ <refsect1 id='see_also'>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>nscd</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>
+ </para>
+ </refsect1>
+</refentry>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org
