frederic heem:

Please find the patch that adds copyrights.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19744 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/cmake/modules/CMakeInstallDirs.cmake b/cmake/modules/CMakeInstallDirs.cmake
index 543c5f376eb1cfdf17f26a84c022a672749d813b..ed6cdeed32443406a8e7c8fd9849e53e758d1bca 100644 (file)
--- a/cmake/modules/CMakeInstallDirs.cmake
+++ b/cmake/modules/CMakeInstallDirs.cmake
@@ -1,8 +1,44 @@
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the <ORGANIZATION> nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
 # - CMakeInstallDirs.cmake
 # This script defines some variables that describe paths needed to install an application:
 # CMAKE_INSTALL_BINDIR
 
 # CMAKE_INSTALL_DATADIR
+# CMAKE_INSTALL_SBINDIR
 # CMAKE_INSTALL_SYSCONFDIR
 # CMAKE_INSTALL_LOCALSTATEDIR
 # CMAKE_INSTALL_LIBDIR
@@ -42,6 +78,7 @@ SET(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/man"
 
 MARK_AS_ADVANCED(
   CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_SBINDIR
   CMAKE_INSTALL_DATADIR
   CMAKE_INSTALL_SYSCONFDIR
   CMAKE_INSTALL_LOCALSTATEDIR

diff --git a/cmake/modules/Check64BitFormat.cmake b/cmake/modules/Check64BitFormat.cmake
index 0941591fca7e784ef908c2c9c5ddb0bbe02abab7..3cad33d6451a28c5d93cda95e83de163b72cf5b3 100644 (file)
--- a/cmake/modules/Check64BitFormat.cmake
+++ b/cmake/modules/Check64BitFormat.cmake
@@ -1,6 +1,41 @@
-# - Check if the function exists.
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the Telsey nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
+# - Check the 64 bit formats.
 # CHECK_64BIT_FORMAT(FORMAT VARIABLE)
-# - macro which checks if the function exists
+# - macro which checks if the 64 bit format is accepted
 #  FORMAT - the format, e.g ll, L, q or I64
 #  VARIABLE - variable to store the format if it is a valdid format
 #

diff --git a/cmake/modules/FindADNS.cmake b/cmake/modules/FindADNS.cmake
index 3a9aabe63762fd412cd55e7af5eee102c1781405..625c8972880f5ba188e2e340c35b2fadce321bd0 100644 (file)
--- a/cmake/modules/FindADNS.cmake
+++ b/cmake/modules/FindADNS.cmake
@@ -1,3 +1,38 @@
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the Telsey nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
 # - Find adns
 # Find the gnu adns includes and library
 # http://www.chiark.greenend.org.uk/~ian/adns/

diff --git a/cmake/modules/FindDBUS.cmake b/cmake/modules/FindDBUS.cmake
index 8f1946e971c3dd14c796f2aa394f427f19edf560..cc8d1894aa813b561e7f4d9e3d27351ae19c19d4 100644 (file)
--- a/cmake/modules/FindDBUS.cmake
+++ b/cmake/modules/FindDBUS.cmake
@@ -1,3 +1,38 @@
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the Telsey nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
 # - Locate D-Bus include paths and libraries.
 #  D-Bus can be found at http://www.freedesktop.org/wiki/Software/dbus.
 #  Written by Frederic Heem, frederic.heem _at_ telsey.it

diff --git a/cmake/modules/FindDBUSGLIB.cmake b/cmake/modules/FindDBUSGLIB.cmake
index 644deb55ab4b621adf903f89d6402126a185db2b..61b4a1485d0bf847c9c752dcd8c0ef0dbc082750 100644 (file)
--- a/cmake/modules/FindDBUSGLIB.cmake
+++ b/cmake/modules/FindDBUSGLIB.cmake
@@ -1,3 +1,38 @@
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the Telsey nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
 # - Locate dbus-glib-1 include paths and libraries
 #  dbus-glib-1 can be found at http://www.freedesktop.org/wiki/Software/dbus
 #  Written by Frederic Heem, frederic.heem _at_ telsey.it

diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake
deleted file mode 100644 (file)
index bd0da85..0000000
--- a/cmake/modules/FindGCRYPT.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# - Find pcap
-# Find the PCAP includes and library
-#
-#  PCAP_INCLUDE_DIRS - where to find pcap.h, etc.
-#  PCAP_LIBRARIES   - List of libraries when using pcap.
-#  PCAP_FOUND       - True if pcap found.
-
-#Includes
-FIND_PATH(PCAP_INCLUDE_DIR pcap.h
-  /usr/local/include
-  /usr/include
-)
-
-SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})
-
-#Library
-FIND_LIBRARY(PCAP_LIBRARY
-  NAMES pcap
-  PATHS /usr/lib /usr/local/lib
-)
-
-SET(PCAP_LIBRARIES ${PCAP_LIBRARY})
-
-#Functions
-INCLUDE(CheckFunctionExists)
-SET(CMAKE_REQUIRED_INCLUDES ${PCAP_INCLUDE_DIRS})
-SET(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARIES})
-CHECK_FUNCTION_EXISTS("pcap_breakloop" HAVE_PCAP_BREAKLOOP)
-CHECK_FUNCTION_EXISTS("pcap_datalink_name_to_val" HAVE_PCAP_DATALINK_NAME_TO_VAL)
-CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_name" HAVE_PCAP_DATALINK_VAL_TO_NAME)
-CHECK_FUNCTION_EXISTS("pcap_findalldevs" HAVE_PCAP_FINDALLDEVS)
-CHECK_FUNCTION_EXISTS("pcap_freecode" HAVE_PCAP_FREECODE)
-CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD)
-CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION)
-CHECK_FUNCTION_EXISTS("pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS)
-CHECK_FUNCTION_EXISTS("pcap_open_dead" HAVE_PCAP_OPEN_DEAD)
-CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK)
-
-
-#Is pcap found ?
-IF(PCAP_INCLUDE_DIR AND PCAP_LIBRARY)
-  SET( PCAP_FOUND "YES" )
-ENDIF(PCAP_INCLUDE_DIR AND PCAP_LIBRARY)
-
-
-MARK_AS_ADVANCED(
-  PCAP_LIBRARY
-  PCAP_INCLUDE_DIR
-)

diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake
index fbbaf62eac407a53e74b7a959936ea6e800c3d37..d95baf4eb445e0accd4d7943366971116bc3f798 100644 (file)
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@@ -1,3 +1,38 @@
+###################################################################
+#
+#  Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+#  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of the Telsey nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+###################################################################
 # - Find pcap
 # Find the PCAP includes and library
 # http://www.tcpdump.org/

diff --git a/cmake/modules/UsePkgConfig.cmake b/cmake/modules/UsePkgConfig.cmake
index 9a15015e0784191acfa61895605298e8913f4aa5..f131436d8ec370707cd344b3ede523e7cae73309 100644 (file)
--- a/cmake/modules/UsePkgConfig.cmake
+++ b/cmake/modules/UsePkgConfig.cmake
@@ -1,3 +1,11 @@
+###################################################################
+#
+# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it>
+# Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+#  All rights reserved.
+#
+###################################################################
 # - pkg-config module for CMake
 #
 # Defines the following macros: