* Update build system and licensing terms to 2008 standards.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/pwntcha/trunk@2315 92316355-f0b4-4df1-b90c-862c8a59935f

.gitignore

@@ -0,0 +1,18 @@
+aclocal.m4
+autom4te.cache
+configure
+config.h.in
+config.h
+config.log
+config.status
+Makefile.in
+Makefile
+libtool
+stamp-h1
+.auto
+.deps
+.libs
+*.la
+*.lo
+*.o
+src/pwntcha

COPYING

@@ -1,12 +1,14 @@
-do What The Fuck you want to Public License
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
 
-Version 1.0, March 2000
-Copyright (C) 2000 Banlu Kemiyatorn (]d).
-136 Nives 7 Jangwattana 14 Laksi Bangkok
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+ Copyright (C) 2004 Sam Hocevar
+  14 rue de Plaisance, 75014 Paris, France
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
 
-Ok, the purpose of this license is simple
-and you just
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-DO WHAT THE FUCK YOU WANT TO. 

bootstrap

@@ -1,30 +1,51 @@
 #! /bin/sh
+# $Id: bootstrap 1966 2008-02-17 08:29:51Z sam $
 
-##  bootstrap file for Elk -- Sam Hocevar <sam@zoy.org>
-##  $Id: bootstrap 253 2004-08-09 20:08:52Z sam $
+# bootstrap: generic bootstrap/autogen.sh script for autotools projects
+#
+# Copyright (c) 2002-2008 Sam Hocevar <sam@zoy.org>
+#
+#    This program is free software. It comes without any warranty, to
+#    the extent permitted by applicable law. You can redistribute it
+#    and/or modify it under the terms of the Do What The Fuck You Want
+#    To Public License, Version 2, as published by Sam Hocevar. See
+#    http://sam.zoy.org/wtfpl/COPYING for more details.
+#
+# The latest version of this script can be found at the following place:
+#   http://sam.zoy.org/autotools/
 
-set -x
+# Die if an error occurs
 set -e
 
-# Get a sane environment, just in case
-LANG=C
-export LANG
-CYGWIN=binmode
-export CYGWIN
+# Guess whether we are using configure.ac or configure.in
+if test -f configure.ac; then
+  conffile="configure.ac"
+elif test -f configure.in; then
+  conffile="configure.in"
+else
+  echo "$0: could not find configure.ac or configure.in"
+  exit 1
+fi
+
+# Check for needed features
+auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
+libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
+header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
+aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
 
 # Check for automake
 amvers="no"
-if automake-1.9 --version >/dev/null 2>&1; then
-  amvers="-1.9"
-elif automake-1.8 --version >/dev/null 2>&1; then
-  amvers="-1.8"
-elif automake-1.7 --version >/dev/null 2>&1; then
-  amvers="-1.7"
-elif automake-1.6 --version >/dev/null 2>&1; then
-  amvers="-1.6"
-elif automake-1.5 --version >/dev/null 2>&1; then
-  amvers="-1.5"
-elif automake --version > /dev/null 2>&1; then
+for v in 11 10 9 8 7 6 5; do
+  if automake-1.${v} --version >/dev/null 2>&1; then
+    amvers="-1.${v}"
+    break
+  elif automake1.${v} --version >/dev/null 2>&1; then
+    amvers="1.${v}"
+    break
+  fi
+done
+
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
   amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
   if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
     amvers="no"
@@ -34,18 +55,75 @@ elif automake --version > /dev/null 2>&1; then
 fi
 
 if test "$amvers" = "no"; then
-  set +x
   echo "$0: you need automake version 1.5 or later"
   exit 1
 fi
 
+# Check for autoconf
+acvers="no"
+for v in "" "259" "253"; do
+  if autoconf${v} --version >/dev/null 2>&1; then
+    acvers="${v}"
+    break
+  fi
+done
+
+if test "$acvers" = "no"; then
+  echo "$0: you need autoconf"
+  exit 1
+fi
+
+# Check for libtool
+if test "$libtool" = "yes"; then
+  libtoolize="no"
+  if glibtoolize --version >/dev/null 2>&1; then
+    libtoolize="glibtoolize"
+  else
+    for v in "16" "15" "" "14"; do
+      if libtoolize${v} --version >/dev/null 2>&1; then
+        libtoolize="libtoolize${v}"
+        break
+      fi
+    done
+  fi
+
+  if test "$libtoolize" = "no"; then
+    echo "$0: you need libtool"
+    exit 1
+  fi
+fi
+
 # Remove old cruft
-rm -f aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh INSTALL
-rm -Rf autom4te.cache autotools
-mkdir autotools
-
-aclocal${amvers}
-autoconf
-autoheader
-automake${amvers} --add-missing --copy
+for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
+rm -Rf autom4te.cache
+if test -n "$auxdir"; then
+  if test ! -d "$auxdir"; then
+    mkdir "$auxdir"
+  fi
+  aclocalflags="${aclocalflags} -I $auxdir -I ."
+fi
+
+# Explain what we are doing from now
+set -x
+
+# Bootstrap package
+if test "$libtool" = "yes"; then
+  ${libtoolize} --copy --force
+  if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then
+    echo "$0: working around a minor libtool issue"
+    mv ltmain.sh "$auxdir/"
+  fi
+fi
+
+aclocal${amvers} ${aclocalflags}
+autoconf${acvers}
+if test "$header" = "yes"; then
+  autoheader${acvers}
+fi
+#add --include-deps if you want to bootstrap with any other compiler than gcc
+#automake${amvers} --add-missing --copy --include-deps
+automake${amvers} --foreign --add-missing --copy
+
+# Remove cruft that we no longer want
+rm -Rf autom4te.cache
 

configure.ac

@@ -1,14 +1,14 @@
 # $Id: configure.ac 253 2004-08-09 20:08:52Z sam $
 
-AC_INIT(src/main.c)
+AC_INIT(pwntcha, 0.6)
+AC_CONFIG_AUX_DIR(.auto)
+AM_INIT_AUTOMAKE([no-define tar-ustar])
 
-AC_PREREQ(2.50)
-AC_CONFIG_AUX_DIR(autotools)
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(pwntcha, 0.5)
 AM_CONFIG_HEADER(config.h)
 
+AC_PREREQ(2.50)
+dnlAC_CANONICAL_SYSTEM
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX

extras/makefont.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  *
  * Build example:
  *   gcc -Wall makefont.c -o makefont `sdl-config --cflags --libs` -lSDL_ttf

src/authimage.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/clubic.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/common.h

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 /* image structure */

src/easter-eggs.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/filter.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/font.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/image.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/java.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/linuxfr.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/livejournal.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/lmt.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/main.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>
@@ -88,7 +89,7 @@ int main(int argc, char *argv[])
             share = optarg;
             break;
         case 'v': /* --version */
-            printf("pwntcha (captcha decoder) %s\n", VERSION);
+            printf("pwntcha (captcha decoder) %s\n", PACKAGE_VERSION);
             printf("Written by Sam Hocevar.\n");
             printf("\n");
             printf("Copyright (C) 2004-2005 Sam Hocevar <sam@zoy.org>\n");

src/paypal.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/phpbb.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/scode.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/slashdot.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/test.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2004 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/ticketmaster.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2006 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/tickets.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/vbulletin.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>

src/xanga.c

@@ -3,10 +3,11 @@
  * $Id$
  *
  * Copyright: (c) 2005 Sam Hocevar <sam@zoy.org>
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the Do What The Fuck You Want To
- *   Public License as published by Banlu Kemiyatorn. See
- *   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+ *  This program is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
 
 #include <stdio.h>