← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ntp/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/autotools.patch/ntpdate/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-04-03 07:21:01 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20130403072101-v3vt8xcs18b6uhjf
Tags: 1:4.2.6.p5+dfsg-2ubuntu1
* New upstream version, fixing build failure in raring.
* Merge with Debian; remaining changes:
  + debian/ntp.conf, debian/ntpdate.default: Change default server to
    ntp.ubuntu.com.
  + debian/ntpdate.ifup: Stop ntp before running ntpdate when an interface
    comes up, then start again afterwards.
  + debian/ntp.init, debian/rules: Only stop when entering single user mode.
  + Add enforcing AppArmor profile:
    - debian/control: Add Conflicts/Replaces on apparmor-profiles.
    - debian/control: Add Suggests on apparmor.
    - debian/ntp.dirs: Add apparmor directories.
    - debian/ntp.preinst: Force complain on certain upgrades.
    - debian/ntp.postinst: Reload apparmor profile.
    - debian/ntp.postrm: Remove the force-complain file.
    - add debian/apparmor-profile*.
    - debian/rules: install apparmor-profile and apparmor-profile.tunable.
    - debian/README.Debian: Add note on AppArmor.
  + debian/{control,rules}: Add and enable hardened build for PIE.
  + debian/apparmor-profile: Adjust location of drift files.
  + debian/rules, debian/ntp.dirs, debian/source_ntp.py: Add apport hook.
  + debian/ntpdate-debian: Disregard empty ntp.conf files.
  + debian/ntp.preinst: Remove empty /etc/ntp.conf on fresh intallation.
  + debian/ntpdate.ifup: Fix interaction with openntpd.
  + debian/source_ntp.py: Add filter on AppArmor profile names to prevent
    false positives from denials originating in other packages.
  + debian/apparmor-profile: Add samba4 ntp signing socket to ntpd apparmor
    profile.
  + debian/apparmor-profile: adjust for IPv6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/autotools.patch/ntpdate/Makefile.in
48
48
subdir = ntpdate
49
49
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
50
50
am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
51
 
        $(top_srcdir)/m4/define_dir.m4 \
 
51
        $(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \
 
52
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 
53
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
52
54
        $(top_srcdir)/m4/ntp_cacheversion.m4 \
53
55
        $(top_srcdir)/m4/ntp_dir_sep.m4 \
54
56
        $(top_srcdir)/m4/ntp_lineeditlibs.m4 \
105
107
CLKTEST = @CLKTEST@
106
108
CPP = @CPP@
107
109
CPPFLAGS = @CPPFLAGS@
108
 
CXX = @CXX@
109
 
CXXCPP = @CXXCPP@
110
 
CXXDEPMODE = @CXXDEPMODE@
111
 
CXXFLAGS = @CXXFLAGS@
112
110
CYGPATH_W = @CYGPATH_W@
113
111
DCFD = @DCFD@
114
112
DEFS = @DEFS@
115
113
DEPDIR = @DEPDIR@
116
 
ECHO = @ECHO@
 
114
DLLTOOL = @DLLTOOL@
 
115
DSYMUTIL = @DSYMUTIL@
 
116
DUMPBIN = @DUMPBIN@
117
117
ECHO_C = @ECHO_C@
118
118
ECHO_N = @ECHO_N@
119
119
ECHO_T = @ECHO_T@
122
122
EF_PROGS = @EF_PROGS@
123
123
EGREP = @EGREP@
124
124
EXEEXT = @EXEEXT@
125
 
F77 = @F77@
126
 
FFLAGS = @FFLAGS@
 
125
FGREP = @FGREP@
127
126
GREP = @GREP@
128
127
HAVE_INLINE = @HAVE_INLINE@
129
128
INSTALL = @INSTALL@
132
131
INSTALL_SCRIPT = @INSTALL_SCRIPT@
133
132
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
134
133
LCRYPTO = @LCRYPTO@
 
134
LD = @LD@
135
135
LDFLAGS = @LDFLAGS@
136
136
LIBOBJS = @LIBOBJS@
137
137
LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
140
140
LIBPARSE = @LIBPARSE@
141
141
LIBS = @LIBS@
142
142
LIBTOOL = @LIBTOOL@
 
143
LIPO = @LIPO@
143
144
LN_S = @LN_S@
144
145
LSCF = @LSCF@
145
146
LTLIBOBJS = @LTLIBOBJS@
156
157
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
157
158
MAKE_TICKADJ = @MAKE_TICKADJ@
158
159
MAKE_TIMETRIM = @MAKE_TIMETRIM@
 
160
MANIFEST_TOOL = @MANIFEST_TOOL@
159
161
MKDIR_P = @MKDIR_P@
 
162
NM = @NM@
 
163
NMEDIT = @NMEDIT@
 
164
OBJDUMP = @OBJDUMP@
160
165
OBJEXT = @OBJEXT@
161
166
OPENSSL = @OPENSSL@
162
167
OPENSSL_INC = @OPENSSL_INC@
163
168
OPENSSL_LIB = @OPENSSL_LIB@
 
169
OTOOL = @OTOOL@
 
170
OTOOL64 = @OTOOL64@
164
171
PACKAGE = @PACKAGE@
165
172
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
166
173
PACKAGE_NAME = @PACKAGE_NAME@
173
180
PATH_SEPARATOR = @PATH_SEPARATOR@
174
181
PATH_SH = @PATH_SH@
175
182
PATH_TEST = @PATH_TEST@
 
183
POSIX_SHELL = @POSIX_SHELL@
176
184
PROPDELAY = @PROPDELAY@
177
185
RANLIB = @RANLIB@
 
186
SED = @SED@
178
187
SET_MAKE = @SET_MAKE@
179
188
SHELL = @SHELL@
180
189
SNMP_CFLAGS = @SNMP_CFLAGS@
189
198
abs_srcdir = @abs_srcdir@
190
199
abs_top_builddir = @abs_top_builddir@
191
200
abs_top_srcdir = @abs_top_srcdir@
 
201
ac_ct_AR = @ac_ct_AR@
192
202
ac_ct_CC = @ac_ct_CC@
193
 
ac_ct_CXX = @ac_ct_CXX@
194
 
ac_ct_F77 = @ac_ct_F77@
 
203
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
195
204
am__include = @am__include@
196
205
am__leading_dot = @am__leading_dot@
197
206
am__quote = @am__quote@