← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/autotools.patch/kernel/sys/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/kernel/sys/Makefile.in
39
39
        $(srcdir)/Makefile.in
40
40
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41
41
am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
42
 
        $(top_srcdir)/m4/define_dir.m4 \
 
42
        $(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \
 
43
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 
44
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
43
45
        $(top_srcdir)/m4/ntp_cacheversion.m4 \
44
46
        $(top_srcdir)/m4/ntp_dir_sep.m4 \
45
47
        $(top_srcdir)/m4/ntp_lineeditlibs.m4 \
74
76
CLKTEST = @CLKTEST@
75
77
CPP = @CPP@
76
78
CPPFLAGS = @CPPFLAGS@
77
 
CXX = @CXX@
78
 
CXXCPP = @CXXCPP@
79
 
CXXDEPMODE = @CXXDEPMODE@
80
 
CXXFLAGS = @CXXFLAGS@
81
79
CYGPATH_W = @CYGPATH_W@
82
80
DCFD = @DCFD@
83
81
DEFS = @DEFS@
84
82
DEPDIR = @DEPDIR@
85
 
ECHO = @ECHO@
 
83
DLLTOOL = @DLLTOOL@
 
84
DSYMUTIL = @DSYMUTIL@
 
85
DUMPBIN = @DUMPBIN@
86
86
ECHO_C = @ECHO_C@
87
87
ECHO_N = @ECHO_N@
88
88
ECHO_T = @ECHO_T@
91
91
EF_PROGS = @EF_PROGS@
92
92
EGREP = @EGREP@
93
93
EXEEXT = @EXEEXT@
94
 
F77 = @F77@
95
 
FFLAGS = @FFLAGS@
 
94
FGREP = @FGREP@
96
95
GREP = @GREP@
97
96
HAVE_INLINE = @HAVE_INLINE@
98
97
INSTALL = @INSTALL@
101
100
INSTALL_SCRIPT = @INSTALL_SCRIPT@
102
101
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
103
102
LCRYPTO = @LCRYPTO@
 
103
LD = @LD@
104
104
LDFLAGS = @LDFLAGS@
105
105
LIBOBJS = @LIBOBJS@
106
106
LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
109
109
LIBPARSE = @LIBPARSE@
110
110
LIBS = @LIBS@
111
111
LIBTOOL = @LIBTOOL@
 
112
LIPO = @LIPO@
112
113
LN_S = @LN_S@
113
114
LSCF = @LSCF@
114
115
LTLIBOBJS = @LTLIBOBJS@
125
126
MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
126
127
MAKE_TICKADJ = @MAKE_TICKADJ@
127
128
MAKE_TIMETRIM = @MAKE_TIMETRIM@
 
129
MANIFEST_TOOL = @MANIFEST_TOOL@
128
130
MKDIR_P = @MKDIR_P@
 
131
NM = @NM@
 
132
NMEDIT = @NMEDIT@
 
133
OBJDUMP = @OBJDUMP@
129
134
OBJEXT = @OBJEXT@
130
135
OPENSSL = @OPENSSL@
131
136
OPENSSL_INC = @OPENSSL_INC@
132
137
OPENSSL_LIB = @OPENSSL_LIB@
 
138
OTOOL = @OTOOL@
 
139
OTOOL64 = @OTOOL64@
133
140
PACKAGE = @PACKAGE@
134
141
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
135
142
PACKAGE_NAME = @PACKAGE_NAME@
142
149
PATH_SEPARATOR = @PATH_SEPARATOR@
143
150
PATH_SH = @PATH_SH@
144
151
PATH_TEST = @PATH_TEST@
 
152
POSIX_SHELL = @POSIX_SHELL@
145
153
PROPDELAY = @PROPDELAY@
146
154
RANLIB = @RANLIB@
 
155
SED = @SED@
147
156
SET_MAKE = @SET_MAKE@
148
157
SHELL = @SHELL@
149
158
SNMP_CFLAGS = @SNMP_CFLAGS@
158
167
abs_srcdir = @abs_srcdir@
159
168
abs_top_builddir = @abs_top_builddir@
160
169
abs_top_srcdir = @abs_top_srcdir@
 
170
ac_ct_AR = @ac_ct_AR@
161
171
ac_ct_CC = @ac_ct_CC@
162
 
ac_ct_CXX = @ac_ct_CXX@
163
 
ac_ct_F77 = @ac_ct_F77@
 
172
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
164
173
am__include = @am__include@
165
174
am__leading_dot = @am__leading_dot@
166
175
am__quote = @am__quote@