Changeset 29885


Ignore:
Timestamp:
2012-01-24T13:44:15+01:00 (5 years ago)
Author:
swalker
Message:

[packages] openldap: remove unused ldif directory (#10712, thanks flyn), add missing libuuid dependency, remove symlink copies

Location:
packages/libs/openldap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/openldap/Makefile

    r28905 r29885  
    1 #  
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=openldap 
    1111PKG_VERSION:=2.4.23 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=4 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz 
     
    2929endef 
    3030 
     31define Package/openldap/Default/description 
     32        OpenLDAP Software is an open source implementation of the 
     33        Lightweight Directory Access Protocol (LDAP). 
     34endef 
     35 
    3136define Package/libopenldap 
    3237  $(call Package/openldap/Default) 
     
    3843 
    3944define Package/libopenldap/description 
    40         OpenLDAP Software is an open source implementation of the  
    41         Lightweight Directory Access Protocol (LDAP).    
     45        $(call Package/openldap/Default/description) 
    4246        This package contains the shared LDAP client libraries, needed by other programs. 
    4347endef 
     
    5660 
    5761define Package/openldap-utils/description 
    58         OpenLDAP Software is an open source implementation of the  
    59         Lightweight Directory Access Protocol (LDAP).    
     62        $(call Package/openldap/Default/description) 
    6063        This package contains client programs required to access LDAP servers. 
    6164endef 
     
    6568  SECTION:=net 
    6669  CATEGORY:=Network 
    67   DEPENDS:=+libopenldap 
     70  DEPENDS:=+libopenldap +libuuid 
    6871  TITLE+= (server) 
    6972endef 
    7073 
    7174define Package/openldap-server/description 
    72         OpenLDAP Software is an open source implementation of the  
    73         Lightweight Directory Access Protocol (LDAP).    
     75        $(call Package/openldap/Default/description) 
    7476        This package contains server programs required to provide LDAP services. 
    7577endef 
     
    114116        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/ 
    115117        $(INSTALL_DIR) $(1)/usr/lib/ 
    116         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ 
     118        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ 
    117119endef 
    118120 
     
    121123        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/ 
    122124        $(INSTALL_DIR) $(1)/usr/lib 
    123         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ 
     125        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ 
    124126endef 
    125          
     127 
    126128define Package/openldap-utils/install 
    127129        $(INSTALL_DIR) $(1)/usr/bin 
    128         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ 
     130        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ 
    129131endef 
    130          
     132 
    131133define Package/openldap-server/install 
    132134        $(INSTALL_DIR) $(1)/etc/init.d 
    133135        $(INSTALL_BIN) ./files/ldap.init $(1)/etc/init.d/ldap 
    134         $(INSTALL_DIR) $(1)/etc/openldap/ldif 
    135136        $(INSTALL_DIR) $(1)/etc/openldap/schema 
    136137        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/ 
  • packages/libs/openldap/patches/020-autofs-schema.patch

    r24055 r29885  
    66+       EQUALITY caseExactMatch 
    77+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) 
    8 +                        
     8+ 
    99+attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey' 
    1010+       DESC 'Automount key value' 
    1111+       EQUALITY caseExactMatch 
    1212+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) 
    13 +                        
     13+ 
    1414+attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation' 
    1515+       DESC 'Automount information' 
    1616+       EQUALITY caseExactMatch 
    1717+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) 
    18 +                        
     18+ 
    1919+objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL 
    2020+       MUST ( automountMapName ) 
    2121+       MAY ( description ) ) 
    22 +                                        
     22+ 
    2323+objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL 
    2424+       DESC 'Automount' 
Note: See TracChangeset for help on using the changeset viewer.