- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Xcode: update project file for Xcode 4.2
by alex＠arthur.barton.de 24 Dez '11

24 Dez '11

Module: ngircd.git Branch: master Commit: 872dc5042d47a43f02c10df9c74ee2c0e7b28c81 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=872dc504… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:22:34 2011 +0100 Xcode: update project file for Xcode 4.2 --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 42ddbf2..6ebe171 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -349,6 +349,8 @@ FAE5CC2C0CF2308A007D69B6 /* numeric.h */, FA85178B0FA061EC006A1F5A /* op.c */, FA85178A0FA061EC006A1F5A /* op.h */, + FA2D564911EA158B00D37A35 /* pam.c */, + FA2D564811EA158B00D37A35 /* pam.h */, FA322D080CEF74B1001761B3 /* parse.c */, FA322D090CEF74B1001761B3 /* parse.h */, FA99428B10E82A27007F27ED /* proc.c */, @@ -357,8 +359,6 @@ FA322D0D0CEF74B1001761B3 /* resolve.h */, FAA97C55124A271400D5BBA9 /* sighandlers.c */, FAA97C56124A271400D5BBA9 /* sighandlers.h */, - FA2D564811EA158B00D37A35 /* pam.h */, - FA2D564911EA158B00D37A35 /* pam.c */, ); path = ngircd; sourceTree = "<group>"; @@ -648,7 +648,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; compatibilityVersion = "Xcode 3.2"; @@ -722,6 +722,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -765,7 +766,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = ""; + SDKROOT = macosx; }; name = Debug; }; @@ -773,6 +774,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;

1 0

Alexander Barton : define HAVE_GAI_STRERROR for Mac OS X Xcode builds
by alex＠arthur.barton.de 24 Dez '11

24 Dez '11

Module: ngircd.git Branch: master Commit: e1315f30fd2e1984907dc42cf1fd0370354d4f55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e1315f30… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:16:38 2011 +0100 define HAVE_GAI_STRERROR for Mac OS X Xcode builds On Mac OS X 10.7 Lion, this fixes In file included from .../contrib/MacOSX/../../src/ngircd/client.c:28: /Developer/SDKs/MacOSX10.7.sdk/usr/include/netdb.h:272:13: error: expected identifier or '(' --- contrib/MacOSX/config.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 86b460b..5b47e9d 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -74,6 +74,8 @@ /* Define to 1 if you have the <netinet/ip.h> header file. */ #define HAVE_NETINET_IP_H 1 +/* Define to 1 if you have the `gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 /* Define to 1 if you have the `kqueue' function. */ #define HAVE_KQUEUE 1 /* Define to 1 if you have the `inet_ntoa' function. */

1 0

Alexander Barton : Configuration: get rid of Conf_Oper_Count and Conf_Channel_Count
by alex＠arthur.barton.de 07 Dez '11

07 Dez '11

Module: ngircd.git Branch: master Commit: 0a85c58878a594ed0b0767771b128d4e288057cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a85c588… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 27 17:03:30 2011 +0200 Configuration: get rid of Conf_Oper_Count and Conf_Channel_Count Count elements dynamically when needed. --- src/ngircd/conf.c | 65 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index dccc9c7..b930b6c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -55,8 +55,6 @@ static bool Use_Log = true, Using_MotdFile = true; static CONF_SERVER New_Server; static int New_Server_Idx; -static size_t Conf_Oper_Count; -static size_t Conf_Channel_Count; static char Conf_MotdFile[FNAME_LEN]; static void Set_Defaults PARAMS(( bool InitServers )); @@ -265,18 +263,18 @@ static void opers_puts(void) { struct Conf_Oper *op; - size_t len; + size_t count, i; - len = array_length(&Conf_Opers, sizeof(*op)); + count = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); - while (len--) { - assert(op->name[0]); + for (i = 0; i < count; i++, op++) { + if (!op->name[0]) + continue; puts("[OPERATOR]"); printf(" Name = %s\n", op->name); printf(" Password = %s\n", op->pwd); printf(" Mask = %s\n\n", op->mask ? op->mask : ""); - op++; } } @@ -709,10 +707,6 @@ Set_Defaults(bool InitServers) #endif #endif - /* Initialize IRC operators and channels */ - Conf_Oper_Count = 0; - Conf_Channel_Count = 0; - /* Initialize server configuration structures */ if (InitServers) { for (i = 0; i < MAX_SERVERS; @@ -787,6 +781,7 @@ Read_Config( bool ngircd_starting ) char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; const UINT16 defaultport = 6667; int line, i, n; + size_t count; FILE *fd; /* Open configuration file */ @@ -887,12 +882,30 @@ Read_Config( bool ngircd_starting ) else New_Server_Idx = i; continue; } + if (strcasecmp(section, "[CHANNEL]") == 0) { - Conf_Channel_Count++; + count = array_length(&Conf_Channels, + sizeof(struct Conf_Channel)); + if (!array_alloc(&Conf_Channels, + sizeof(struct Conf_Channel), + count)) { + Config_Error(LOG_ERR, + "Could not allocate memory for new operator (line %d)", + line); + } continue; } + if (strcasecmp(section, "[OPERATOR]") == 0) { - Conf_Oper_Count++; + count = array_length(&Conf_Opers, + sizeof(struct Conf_Oper)); + if (!array_alloc(&Conf_Opers, + sizeof(struct Conf_Oper), + count)) { + Config_Error(LOG_ERR, + "Could not allocate memory for new channel (line &d)", + line); + } continue; } @@ -1584,13 +1597,11 @@ Handle_OPERATOR( int Line, char *Var, char *Arg ) assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - assert( Conf_Oper_Count > 0 ); - op = array_alloc(&Conf_Opers, sizeof(*op), Conf_Oper_Count - 1); - if (!op) { - Config_Error(LOG_ERR, "Could not allocate memory for operator (%d:%s = %s)", Line, Var, Arg); + op = array_get(&Conf_Opers, sizeof(*op), + array_length(&Conf_Opers, sizeof(*op)) - 1); + if (!op) return; - } if (strcasecmp(Var, "Name") == 0) { /* Name of IRC operator */ @@ -1756,21 +1767,17 @@ static void Handle_CHANNEL(int Line, char *Var, char *Arg) { size_t len; - size_t chancount; struct Conf_Channel *chan; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - assert(Conf_Channel_Count > 0); - chancount = Conf_Channel_Count - 1; - - chan = array_alloc(&Conf_Channels, sizeof(*chan), chancount); - if (!chan) { - Config_Error(LOG_ERR, "Could not allocate memory for predefined channel (%d:%s = %s)", Line, Var, Arg); + chan = array_get(&Conf_Channels, sizeof(*chan), + array_length(&Conf_Channels, sizeof(*chan)) - 1); + if (!chan) return; - } + if (strcasecmp(Var, "Name") == 0) { if (!Handle_Channelname(chan, Arg)) Config_Error_TooLong(Line, Var); @@ -1917,8 +1924,10 @@ Validate_Config(bool Configtest, bool Rehash) } } Log(LOG_DEBUG, - "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", - Conf_Oper_Count, servers, servers_once, Conf_Channel_Count); + "Configuration: Operators=%ld, Servers=%d[%d], Channels=%ld", + array_length(&Conf_Opers, sizeof(struct Conf_Oper)), + servers, servers_once, + array_length(&Conf_Channels, sizeof(struct Conf_Channel))); #endif return config_valid;

1 0

Alexander Barton : ./configure: Fix logic and quoting of poll() detection code
by alex＠arthur.barton.de 05 Dez '11

05 Dez '11

Module: ngircd.git Branch: master Commit: ee21490887690a4c1dcdd7aafd3ffc745c2ca0ca URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ee214908… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 5 00:19:32 2011 +0100 ./configure: Fix logic and quoting of poll() detection code This fixes commit 8e193df ... --- configure.in | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index f3dbd72..d2241f6 100644 --- a/configure.in +++ b/configure.in @@ -252,22 +252,21 @@ AC_ARG_WITH(poll, CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(poll, + AC_CHECK_FUNCS(poll, [ AC_CHECK_HEADERS(poll.h, x_io_backend=poll, - AC_MSG_ERROR( - [Can't enable poll IO support!]) - , AC_MSG_ERROR( - [Can't enable poll IO support!]) + [Can't enable poll IO support!]) ) - ) + ], [ + AC_MSG_ERROR([Can't enable poll IO support!]) + ]) fi ], [ - AC_CHECK_FUNCS(poll, + AC_CHECK_FUNCS(poll, [ AC_CHECK_HEADERS(poll.h, x_io_backend=poll) - ) + ]) ] )

1 0

Alexander Barton : Suppress 'Can't create pre-defined channel: invalid name : ""' messages
by alex＠arthur.barton.de 04 Dez '11

04 Dez '11

Module: ngircd.git Branch: master Commit: 8fa92f0a24bb97a972ef82b8fa057d737c9f55b7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8fa92f0a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 4 22:30:32 2011 +0100 Suppress 'Can't create pre-defined channel: invalid name: ""' messages Skip predefined channel structures that have configured no name, like the "--configtest" does. --- src/ngircd/channel.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index a36131c..74c97a0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -110,9 +110,12 @@ Channel_InitPredefined( void ) assert(channel_count == 0 || conf_chan != NULL); for (i = 0; i < channel_count; i++, conf_chan++) { - if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) { - Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"", - conf_chan->name); + if (!conf_chan->name[0]) + continue; + if (!Channel_IsValidName(conf_chan->name)) { + Log(LOG_ERR, + "Can't create pre-defined channel: invalid name: \"%s\"", + conf_chan->name); continue; }

1 0

Alexander Barton : Only use poll() when poll.h exists as well
by alex＠arthur.barton.de 25 Nov '11

25 Nov '11

Module: ngircd.git Branch: master Commit: 8e193df973bef0765754ccf4d6cb3ea21c226955 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8e193df9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 25 22:06:44 2011 +0100 Only use poll() when poll.h exists as well --- src/ngircd/io.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 7e78e49..f44dfbf 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -54,7 +54,7 @@ typedef struct { # ifdef HAVE_SYS_DEVPOLL_H # define IO_USE_DEVPOLL 1 # else -# ifdef HAVE_POLL +# if defined(HAVE_POLL) && defined(HAVE_POLL_H) # define IO_USE_POLL 1 # else # ifdef HAVE_SELECT

1 0

Alexander Barton : Not only check for poll(), make sure poll. h exists as well
by alex＠arthur.barton.de 25 Nov '11

25 Nov '11

Module: ngircd.git Branch: master Commit: 9d348d00d9eda2aede0ea9052bcc34cd070d3b5a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d348d00… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 25 21:56:33 2011 +0100 Not only check for poll(), make sure poll.h exists as well This fixes building ngIRCd on Debian GNU/Linux 1.3 "Bo" :-) --- configure.in | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 92434ec..f3dbd72 100644 --- a/configure.in +++ b/configure.in @@ -252,13 +252,22 @@ AC_ARG_WITH(poll, CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(poll, x_io_backend=poll, - AC_MSG_ERROR([Can't enable poll IO support!]) + AC_CHECK_FUNCS(poll, + AC_CHECK_HEADERS(poll.h, + x_io_backend=poll, + AC_MSG_ERROR( + [Can't enable poll IO support!]) + , + AC_MSG_ERROR( + [Can't enable poll IO support!]) + ) ) fi ], [ - AC_CHECK_FUNCS(poll, x_io_backend=poll) + AC_CHECK_FUNCS(poll, + AC_CHECK_HEADERS(poll.h, x_io_backend=poll) + ) ] )

1 0

Alexander Barton : whois-test: handle local hostname = "localhost. localdomain"
by alex＠arthur.barton.de 10 Nov '11

10 Nov '11

Module: ngircd.git Branch: master Commit: 9e48f3f8f8c312ee20caef70cfb377a0d89260bb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9e48f3f8… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 10 11:54:22 2011 +0100 whois-test: handle local hostname = "localhost.localdomain" Use the pattern "localhost*" for valid local hostnames. --- src/testsuite/whois-test.e | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e index 7024d5f..2aed694 100644 --- a/src/testsuite/whois-test.e +++ b/src/testsuite/whois-test.e @@ -17,31 +17,31 @@ expect { send "whois nick\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois *\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois n*\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois ?ick\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "whois ????,n?*k\r" expect { timeout { exit 1 } - "311 nick nick ~user localhost \* :Real Name\r" + "311 nick nick ~user localhost* \* :Real Name\r" } send "quit\r"

1 0

Alexander Barton : sample-ngircd.conf: show correct default for "PAM" variable
by alex＠arthur.barton.de 08 Nov '11

08 Nov '11

Module: ngircd.git Branch: master Commit: e4a06844a3b0ad1bbb7307cbe40f7d2bfb2f1226 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e4a06844… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 8 21:12:01 2011 +0100 sample-ngircd.conf: show correct default for "PAM" variable The default of "PAM" is "yes" when ngIRCd has been configured to use it, so show the correct default value in the sample configuration file. Closes #119. --- doc/sample-ngircd.conf.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index fb5d826..26103a7 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -160,7 +160,7 @@ ;OperServerMode = no # Use PAM if ngIRCd has been compiled with support for it. - ;PAM = no + ;PAM = yes # Allow Pre-Defined Channels only (see Section [Channels]) ;PredefChannelsOnly = no

1 0

Alexander Barton : Update GPL 2 license text to current version
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: 20ccc1bba7773c0f73afe2bbcc0ffecc7b11269b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=20ccc1bb… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 21:51:48 2011 +0100 Update GPL 2 license text to current version See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>. --- COPYING | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/COPYING b/COPYING index 14db8fc..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ 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 +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ 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 + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: 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 @@ -168,7 +168,7 @@ 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 @@ -225,7 +225,7 @@ 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 @@ -255,7 +255,7 @@ 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 + 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 @@ -277,9 +277,9 @@ 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 + 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 @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + 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. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: 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 +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.

1 0