summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-06-03 14:35:01 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-06-03 14:35:01 +0000
commit06947e5a2eef745672a95e9d8dbd20acb950e608 (patch)
treea52696211bac35a4a4aa96fe8b5eb4328ae01624
parent65ec8c5bf2ebf3d8598afd9939bc4c4636330d3e (diff)
Remove clauses 3 and 4. Approved by Niklas Hallqvist and Niels Provos.
-rw-r--r--sbin/isakmpd/apps/Makefile7
-rw-r--r--sbin/isakmpd/apps/certpatch/Makefile7
2 files changed, 2 insertions, 12 deletions
diff --git a/sbin/isakmpd/apps/Makefile b/sbin/isakmpd/apps/Makefile
index 78c8808e300..91b36da5b11 100644
--- a/sbin/isakmpd/apps/Makefile
+++ b/sbin/isakmpd/apps/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1999/07/17 21:48:59 niklas Exp $
+# $OpenBSD: Makefile,v 1.2 2003/06/03 14:35:00 ho Exp $
# $EOM: Makefile,v 1.2 1999/07/17 20:44:12 niklas Exp $
#
@@ -12,11 +12,6 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/apps/certpatch/Makefile b/sbin/isakmpd/apps/certpatch/Makefile
index 6204acdb12c..c42293873b2 100644
--- a/sbin/isakmpd/apps/certpatch/Makefile
+++ b/sbin/isakmpd/apps/certpatch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/04/09 21:50:04 ho Exp $
+# $OpenBSD: Makefile,v 1.7 2003/06/03 14:35:00 ho Exp $
# $EOM: Makefile,v 1.6 2000/03/28 21:22:06 ho Exp $
#
@@ -13,11 +13,6 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES